diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md
index 493dff82a101..9e5f553a990f 100644
--- a/doc/build-helpers/fetchers.chapter.md
+++ b/doc/build-helpers/fetchers.chapter.md
@@ -1003,3 +1003,27 @@ fetchtorrent {
 
 - `config`: When using `transmission` as the `backend`, a json configuration can
   be supplied to transmission. Refer to the [upstream documentation](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md) for information on how to configure.
+
+## `fetchItchIo` {#fetchitchio}
+
+`fetchItchIo` is a fetcher for downloading game assets from [itch.io](https://itch.io/). It accepts these arguments:
+
+- `gameUrl`: The store page URL of the game.
+- `upload`: The numerical ID of the asset to download. To find the upload ID of an asset, check the basename of the request URL when you download the asset using a browser.
+- `hash`.
+- `name` (optional): The derivation name, often the filename of the asset.
+- `extraMessage` (optional): Extra message printed if the API key is not provided or if the account did not purchase the game.
+
+For this fetcher to work, the environment variable `NIX_ITCHIO_API_KEY` must be set for the nix building process (which is nix-daemon in multi-user mode), and it must belong to an account that has bought the game if it is behind a paywall.
+To get your API key, go to the ["API key" section](https://itch.io/user/settings/api-keys) of your account settings on itch.io.
+
+```nix
+{ fetchItchIo }:
+
+fetchItchIo {
+  name = "DungeonDuelMonsters-linux-x64.zip";
+  hash = "sha256-gq2nGwpaStqaVI1pL63xygxOI/z53o+zLwiKizG98Ks=";
+  gameUrl = "https://mikaygo.itch.io/ddm";
+  upload = "13371354";
+}
+```
diff --git a/doc/redirects.json b/doc/redirects.json
index 253007c51710..ad19777f2dd2 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -1818,6 +1818,9 @@
   "fetchtorrent-parameters": [
     "index.html#fetchtorrent-parameters"
   ],
+  "fetchitchio": [
+    "index.html#fetchitchio"
+  ],
   "chap-trivial-builders": [
     "index.html#chap-trivial-builders"
   ],
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 7a594d9d26f0..9ca884c690cc 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -1416,7 +1416,7 @@ lib.mapAttrs mkLicense (
 
     tsl = {
       shortName = "TSL";
-      fullName = "Timescale License Agreegment";
+      fullName = "Timescale License Agreement";
       url = "https://github.com/timescale/timescaledb/blob/main/tsl/LICENSE-TIMESCALE";
       free = false;
     };
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8b701c9decbb..fdba52e7b39f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5799,12 +5799,6 @@
     name = "Daniil Berendeev";
     keys = [ { fingerprint = "60D7 0EE0 3BD4 A415 B255  1938 6556 0668 006B 4906"; } ];
   };
-  danbst = {
-    email = "abcz2.uprola@gmail.com";
-    github = "danbst";
-    githubId = 743057;
-    name = "Danylo Hlynskyi";
-  };
   danbulant = {
     name = "Daniel Bulant";
     email = "danbulant@gmail.com";
@@ -25294,6 +25288,11 @@
     githubId = 20484159;
     keys = [ { fingerprint = "F246 425A 7650 6F37 0552  BA8D DEA9 C405 09D9 65F5"; } ];
   };
+  squishykid = {
+    github = "squishykid";
+    githubId = 2177912;
+    name = "squishykid";
+  };
   srgom = {
     github = "SRGOM";
     githubId = 8103619;
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index 35e34c305a05..71caa28a35d8 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -73,7 +73,7 @@ in
         with pkgs;
         [
           linux-firmware
-          intel2200BGFirmware
+          ipw2200-firmware
           rtl8192su-firmware
           rt5677-firmware
           rtl8761b-firmware
diff --git a/nixos/modules/hardware/network/intel-2200bg.nix b/nixos/modules/hardware/network/intel-2200bg.nix
index 7a46469033f3..859c54bbe2bd 100644
--- a/nixos/modules/hardware/network/intel-2200bg.nix
+++ b/nixos/modules/hardware/network/intel-2200bg.nix
@@ -27,7 +27,7 @@
 
   config = lib.mkIf config.networking.enableIntel2200BGFirmware {
 
-    hardware.firmware = [ pkgs.intel2200BGFirmware ];
+    hardware.firmware = [ pkgs.ipw2200-firmware ];
 
   };
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index fb9c8455c115..255c20796217 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1724,6 +1724,7 @@
   ./services/web-apps/peertube.nix
   ./services/web-apps/pgpkeyserver-lite.nix
   ./services/web-apps/photoprism.nix
+  ./services/web-apps/photoview.nix
   ./services/web-apps/phylactery.nix
   ./services/web-apps/pict-rs.nix
   ./services/web-apps/pihole-web.nix
diff --git a/nixos/modules/services/audio/spotifyd.nix b/nixos/modules/services/audio/spotifyd.nix
index 2264d7c39c6b..74cc60fce0f7 100644
--- a/nixos/modules/services/audio/spotifyd.nix
+++ b/nixos/modules/services/audio/spotifyd.nix
@@ -23,6 +23,8 @@ in
     services.spotifyd = {
       enable = lib.mkEnableOption "spotifyd, a Spotify playing daemon";
 
+      package = lib.mkPackageOption pkgs "spotifyd" { };
+
       config = lib.mkOption {
         default = "";
         type = lib.types.lines;
@@ -43,6 +45,7 @@ in
           <https://docs.spotifyd.rs/configuration/index.html#config-file>.
         '';
       };
+
     };
   };
 
@@ -64,7 +67,7 @@ in
       description = "spotifyd, a Spotify playing daemon";
       environment.SHELL = "/bin/sh";
       serviceConfig = {
-        ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --cache-path /var/cache/spotifyd --config-path ${spotifydConf}";
+        ExecStart = "${cfg.package}/bin/spotifyd --no-daemon --cache-path /var/cache/spotifyd --config-path ${spotifydConf}";
         Restart = "always";
         RestartSec = 12;
         DynamicUser = true;
diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix
index 001193a8cd2d..9abce8d7ebba 100644
--- a/nixos/modules/services/desktop-managers/plasma6.nix
+++ b/nixos/modules/services/desktop-managers/plasma6.nix
@@ -168,6 +168,7 @@ in
           ffmpegthumbs
           krdp
           kconfig # required for xdg-terminal from xdg-utils
+          qtbase # for qtpaths which is required for xdg-mime from xdg-utils
         ]
         ++ lib.optionals config.hardware.sensor.iio.enable [
           # This is required for autorotation in Plasma 6
diff --git a/nixos/modules/services/misc/atuin.nix b/nixos/modules/services/misc/atuin.nix
index 43636b948030..df1eaa9c63fa 100644
--- a/nixos/modules/services/misc/atuin.nix
+++ b/nixos/modules/services/misc/atuin.nix
@@ -104,7 +104,7 @@ in
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig = {
-        ExecStart = "${lib.getExe cfg.package} server start";
+        ExecStart = "${lib.getExe' cfg.package "atuin-server"} start";
         RuntimeDirectory = "atuin";
         RuntimeDirectoryMode = "0700";
         DynamicUser = true;
diff --git a/nixos/modules/services/monitoring/fusion-inventory.nix b/nixos/modules/services/monitoring/fusion-inventory.nix
index 1358b3cc0ee3..70331b5a4367 100644
--- a/nixos/modules/services/monitoring/fusion-inventory.nix
+++ b/nixos/modules/services/monitoring/fusion-inventory.nix
@@ -58,7 +58,7 @@ in
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig = {
-        ExecStart = "${pkgs.fusionInventory}/bin/fusioninventory-agent --conf-file=${configFile} --daemon --no-fork";
+        ExecStart = "${pkgs.fusioninventory-agent}/bin/fusioninventory-agent --conf-file=${configFile} --daemon --no-fork";
       };
     };
   };
diff --git a/nixos/modules/services/networking/headscale.nix b/nixos/modules/services/networking/headscale.nix
index 6c6827f74116..b4873b854dd1 100644
--- a/nixos/modules/services/networking/headscale.nix
+++ b/nixos/modules/services/networking/headscale.nix
@@ -327,6 +327,15 @@ in
                 example = "tailnet.example.com";
               };
 
+              override_local_dns = lib.mkOption {
+                type = lib.types.bool;
+                default = true;
+                description = ''
+                  Whether to [override clients' DNS servers](https://tailscale.com/kb/1054/dns#override-dns-servers).
+                '';
+                example = false;
+              };
+
               nameservers = {
                 global = lib.mkOption {
                   type = lib.types.listOf lib.types.str;
@@ -644,6 +653,10 @@ in
         assertion = with cfg.settings; dns.magic_dns -> dns.base_domain != "";
         message = "dns.base_domain must be set when using MagicDNS";
       }
+      {
+        assertion = with cfg.settings; dns.override_local_dns -> dns.nameservers.global != [ ];
+        message = "dns.nameservers.global must be set when overriding local DNS";
+      }
       (assertRemovedOption [ "settings" "acl_policy_path" ] "Use `policy.path` instead.")
       (assertRemovedOption [ "settings" "db_host" ] "Use `database.postgres.host` instead.")
       (assertRemovedOption [ "settings" "db_name" ] "Use `database.postgres.name` instead.")
diff --git a/nixos/modules/services/networking/ircd-hybrid/control.in b/nixos/modules/services/networking/ircd-hybrid/control.in
index 13299bf897cc..df3bda46b29b 100644
--- a/nixos/modules/services/networking/ircd-hybrid/control.in
+++ b/nixos/modules/services/networking/ircd-hybrid/control.in
@@ -17,7 +17,7 @@ if test "$1" = "start"; then
 	chown ircd: /home/ircd
 	cd /home/ircd
     env - HOME=/homeless-shelter $extraEnv \
-        @su@/bin/su ircd --shell=/bin/sh -c ' @ircdHybrid@/bin/ircd -configfile @out@/conf/ircd.conf </dev/null -logfile /home/ircd/ircd.log' 2>&1 >/var/log/ircd-hybrid.out
+        @su@/bin/su ircd --shell=/bin/sh -c ' @ircd-hybrid@/bin/ircd -configfile @out@/conf/ircd.conf </dev/null -logfile /home/ircd/ircd.log' 2>&1 >/var/log/ircd-hybrid.out
 	fi;
 fi
 
diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix
index 95e19636edaf..3626e4be1e1b 100644
--- a/nixos/modules/services/networking/ircd-hybrid/default.nix
+++ b/nixos/modules/services/networking/ircd-hybrid/default.nix
@@ -22,7 +22,7 @@ let
       ./ircd.conf
     ];
     inherit (pkgs)
-      ircdHybrid
+      ircd-hybrid
       coreutils
       su
       iproute2
diff --git a/nixos/modules/services/web-apps/photoview.nix b/nixos/modules/services/web-apps/photoview.nix
new file mode 100644
index 000000000000..a2a8d62c29e8
--- /dev/null
+++ b/nixos/modules/services/web-apps/photoview.nix
@@ -0,0 +1,259 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.photoview;
+
+  dbUrl = {
+    sqlite = "PHOTOVIEW_SQLITE_PATH=${cfg.dataDir}/photoview.db";
+    mysql = "PHOTOVIEW_MYSQL_URL=${cfg.database.user}:$(cat $CREDENTIALS_DIRECTORY/db_password)@tcp(${cfg.database.host}:${toString cfg.database.port})/${cfg.database.name}";
+    postgres = "PHOTOVIEW_POSTGRES_URL=postgres://${cfg.database.user}:$(cat $CREDENTIALS_DIRECTORY/db_password)@${cfg.database.host}:${toString cfg.database.port}/${cfg.database.name}";
+  };
+in
+
+{
+  options.services.photoview = {
+    enable = lib.mkEnableOption "Photoview, a photo gallery for self-hosted personal servers";
+
+    package = lib.mkPackageOption pkgs "photoview" { };
+
+    user = lib.mkOption {
+      type = lib.types.str;
+      default = "photoview";
+      description = "User account under which photoview runs.";
+    };
+
+    group = lib.mkOption {
+      type = lib.types.str;
+      default = "photoview";
+      description = "Group under which photoview runs.";
+    };
+
+    dataDir = lib.mkOption {
+      type = lib.types.path;
+      default = "/var/lib/photoview";
+      description = "Directory for photoview state, cache, and database.";
+    };
+
+    mediaPath = lib.mkOption {
+      type = lib.types.path;
+      description = ''
+        Path to the directory containing photos to be served.
+        This directory must be readable by the photoview user.
+      '';
+      example = "/mnt/photos";
+    };
+
+    host = lib.mkOption {
+      type = lib.types.str;
+      default = "127.0.0.1";
+      description = "Address to listen on.";
+    };
+
+    port = lib.mkOption {
+      type = lib.types.port;
+      default = 4001;
+      description = "Port to listen on.";
+    };
+
+    database = {
+      type = lib.mkOption {
+        type = lib.types.enum [
+          "sqlite"
+          "mysql"
+          "postgres"
+        ];
+        default = "sqlite";
+        description = "Database engine to use.";
+      };
+
+      host = lib.mkOption {
+        type = lib.types.str;
+        default = "localhost";
+        description = "Database host address.";
+      };
+
+      port = lib.mkOption {
+        type = lib.types.port;
+        default = 5432;
+        description = "Database port.";
+      };
+
+      name = lib.mkOption {
+        type = lib.types.str;
+        default = "photoview";
+        description = "Database name.";
+      };
+
+      user = lib.mkOption {
+        type = lib.types.str;
+        default = "photoview";
+        description = "Database user.";
+      };
+
+      passwordFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
+        default = null;
+        description = ''
+          Path to a file containing the database password.
+          Required when using MySQL or PostgreSQL.
+        '';
+      };
+    };
+
+    settings = {
+      disableFaceRecognition = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "Disable face recognition feature.";
+      };
+
+      disableVideoEncoding = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "Disable video encoding with FFmpeg.";
+      };
+
+      disableRawProcessing = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "Disable RAW photo processing.";
+      };
+
+      mapboxToken = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
+        default = null;
+        description = "Mapbox API token for map features.";
+      };
+
+      videoEncoder = lib.mkOption {
+        type = lib.types.nullOr (
+          lib.types.enum [
+            "h264_qsv"
+            "h264_vaapi"
+            "h264_nvenc"
+          ]
+        );
+        default = null;
+        description = "Hardware video encoder to use.";
+      };
+    };
+
+    secretsFile = lib.mkOption {
+      type = lib.types.nullOr lib.types.path;
+      default = null;
+      description = ''
+        Path to an environment file containing secrets.
+        Can be used for MAPBOX_TOKEN or other sensitive settings.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = cfg.database.type == "sqlite" || cfg.database.passwordFile != null;
+        message = "services.photoview.database.passwordFile must be set when using MySQL or PostgreSQL.";
+      }
+    ];
+
+    users.users = lib.mkIf (cfg.user == "photoview") {
+      photoview = {
+        group = cfg.group;
+        home = cfg.dataDir;
+        isSystemUser = true;
+      };
+    };
+
+    users.groups = lib.mkIf (cfg.group == "photoview") {
+      photoview = { };
+    };
+
+    systemd.services.photoview = {
+      description = "Photoview - Photo gallery for self-hosted personal servers";
+      documentation = [ "https://photoview.github.io/docs/" ];
+      wantedBy = [ "multi-user.target" ];
+      after = [
+        "network.target"
+      ]
+      ++ lib.optional (cfg.database.type == "postgres") "postgresql.service"
+      ++ lib.optional (cfg.database.type == "mysql") "mysql.service";
+      requires =
+        lib.optional (cfg.database.type == "postgres") "postgresql.service"
+        ++ lib.optional (cfg.database.type == "mysql") "mysql.service";
+
+      environment = {
+        PHOTOVIEW_DATABASE_DRIVER = cfg.database.type;
+        PHOTOVIEW_LISTEN_IP = cfg.host;
+        PHOTOVIEW_LISTEN_PORT = toString cfg.port;
+        PHOTOVIEW_MEDIA_CACHE = "/var/cache/photoview";
+        PHOTOVIEW_DISABLE_FACE_RECOGNITION = toString cfg.settings.disableFaceRecognition;
+        PHOTOVIEW_DISABLE_VIDEO_ENCODING = toString cfg.settings.disableVideoEncoding;
+        PHOTOVIEW_DISABLE_RAW_PROCESSING = toString cfg.settings.disableRawProcessing;
+      }
+      // lib.optionalAttrs (cfg.settings.mapboxToken != null) {
+        MAPBOX_TOKEN = cfg.settings.mapboxToken;
+      }
+      // lib.optionalAttrs (cfg.settings.videoEncoder != null) {
+        PHOTOVIEW_VIDEO_ENCODER = cfg.settings.videoEncoder;
+      };
+
+      script = ''
+        export ${dbUrl.${cfg.database.type}}
+        exec ${lib.getExe cfg.package}
+      '';
+
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        StateDirectory = "photoview";
+        StateDirectoryMode = "0750";
+        CacheDirectory = "photoview";
+        CacheDirectoryMode = "0750";
+        WorkingDirectory = cfg.dataDir;
+        Restart = "on-failure";
+        RestartSec = 5;
+
+        # Read access to media directory
+        ReadOnlyPaths = [ cfg.mediaPath ];
+
+        # Secrets
+        LoadCredential = lib.optional (
+          cfg.database.passwordFile != null
+        ) "db_password:${cfg.database.passwordFile}";
+        EnvironmentFile = lib.optional (cfg.secretsFile != null) cfg.secretsFile;
+
+        # Hardening
+        CapabilityBoundingSet = "";
+        LockPersonality = true;
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        PrivateTmp = true;
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectSystem = "strict";
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+          "AF_UNIX"
+        ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        SystemCallArchitectures = "native";
+        UMask = "0077";
+      };
+    };
+  };
+
+  meta.maintainers = with lib.maintainers; [ nettika ];
+}
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index db3b3ac8d90f..22d2b274d290 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -14,7 +14,6 @@ in
 {
   meta = {
     maintainers = with lib.maintainers; [
-      danbst
       anthonyroussel
     ];
   };
diff --git a/nixos/modules/system/boot/clevis.nix b/nixos/modules/system/boot/clevis.nix
index 121f0d4cc27f..9ac8496297f2 100644
--- a/nixos/modules/system/boot/clevis.nix
+++ b/nixos/modules/system/boot/clevis.nix
@@ -78,8 +78,8 @@ in
         copy_bin_and_libs ${pkgs.curl}/bin/curl
         copy_bin_and_libs ${pkgs.bashNonInteractive}/bin/bash
         copy_bin_and_libs ${pkgs.cryptsetup}/bin/cryptsetup
-        copy_bin_and_libs ${pkgs.gnused}/bin/gnused
-        copy_bin_and_libs ${pkgs.gnugrep}/bin/gnugrep
+        copy_bin_and_libs ${pkgs.gnused}/bin/sed
+        copy_bin_and_libs ${pkgs.gnugrep}/bin/grep
 
         copy_bin_and_libs ${pkgs.tpm2-tools}/bin/.tpm2-wrapped
         mv $out/bin/{.tpm2-wrapped,tpm2}
@@ -106,6 +106,7 @@ in
       systemd = {
         extraBin = lib.mkIf systemd.enable {
           clevis = "${cfg.package}/bin/clevis";
+          curl = "${pkgs.curl}/bin/curl";
         };
 
         storePaths = lib.mkIf systemd.enable [
diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix
index 9854db830550..3d6803143a85 100644
--- a/nixos/tests/containers-reloadable.nix
+++ b/nixos/tests/containers-reloadable.nix
@@ -2,7 +2,7 @@
 {
   name = "containers-reloadable";
   meta = {
-    maintainers = with lib.maintainers; [ danbst ];
+    maintainers = [ ];
   };
 
   nodes = {
diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix
index 476824e3a9ec..821ece83c73e 100644
--- a/nixos/tests/nginx.nix
+++ b/nixos/tests/nginx.nix
@@ -10,7 +10,6 @@
   meta = with pkgs.lib.maintainers; {
     maintainers = [
       mbbx6spp
-      danbst
     ];
   };
 
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix
index 5452298f4916..619c421cf81c 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix
@@ -6,13 +6,13 @@
 }:
 vimUtils.buildVimPlugin {
   pname = "zig.vim";
-  version = "0-unstable-2026-01-24";
+  version = "0-unstable-2026-02-13";
 
   src = fetchFromCodeberg {
     owner = "ziglang";
     repo = "zig.vim";
-    rev = "2f53c35bee0d64a1d417d47c894a3cbb6663dff4";
-    hash = "sha256-vrtcUAp/YWpZtf6lyg2l0GR62YdHprAb8sAHzZ89F48=";
+    rev = "f65b43b90cbc3e179b3146d2237f503783119ab8";
+    hash = "sha256-4Ssde+vLYn/NnL24sDW6Z+yDN2dWKaOFgrFYm1oVQjg=";
   };
 
   passthru.updateScript = nix-update-script {
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 9cdacea547cd..e2cda36c9e76 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3093,8 +3093,8 @@ let
         mktplcRef = {
           name = "compare-folders";
           publisher = "moshfeu";
-          version = "0.25.3";
-          hash = "sha256-QrSh8/AycC5nKbZ1+E3V/lJu/7Skket8b05yPnZg68s=";
+          version = "0.27.0";
+          hash = "sha256-v4ZIcrYa+5RXSX0OM5atXMcmN/EgAH6qqWS1vksxXpI=";
         };
 
         meta = {
@@ -4340,8 +4340,8 @@ let
         mktplcRef = {
           publisher = "sonarsource";
           name = "sonarlint-vscode";
-          version = "4.42.0";
-          hash = "sha256-jWw5vbORdi/qW8L4D1qbue8tdeiyof01FzJtcZUKs3Y=";
+          version = "4.43.0";
+          hash = "sha256-cpd8+fbp57l+XYBuDnz95lmKzJ8IUHu937KWHsLXrPk=";
         };
         meta.license = lib.licenses.lgpl3Only;
       };
@@ -4788,8 +4788,8 @@ let
         mktplcRef = {
           name = "emacs-mcx";
           publisher = "tuttieee";
-          version = "0.107.1";
-          hash = "sha256-x2WoDoYE4at2G8yuefc5evHRpCiJXh5WTTkNzW454N0=";
+          version = "0.107.2";
+          hash = "sha256-Id8pKACGLtRXas1Tb2dZrw+ZrZvAQLbWcI3Q1gYpXos=";
         };
         meta = {
           changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md";
diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
index 7ccf48d09dfd..2faed5d89a62 100644
--- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
+++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "dosbox-pure";
-  version = "0-unstable-2026-02-05";
+  version = "0-unstable-2026-02-17";
 
   src = fetchFromGitHub {
     owner = "schellingb";
     repo = "dosbox-pure";
-    rev = "6fe60a669e8781d738150ad2353b87c1e1de7dd4";
-    hash = "sha256-6hIevmWusjg8Wr9A5ov6RLovirtOIEhHtEYLQ7EHVh0=";
+    rev = "f587236b2d016f4f16d672e9ce2829bdf507bf9b";
+    hash = "sha256-OS6iY8b8pvqkJpDQO9DHRUh7ckjov5t1GZldOR+qg0Y=";
   };
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix
index 734cc4cf2815..db34318d5545 100644
--- a/pkgs/applications/emulators/wine/base.nix
+++ b/pkgs/applications/emulators/wine/base.nix
@@ -17,13 +17,13 @@
   makeWrapper,
   pkg-config,
   nixosTests,
-  supportFlags,
   pnameSuffix ? "",
   patches,
   moltenvk,
   buildScript ? null,
   configureFlags ? [ ],
   mainProgram ? "wine",
+
   # Staging support
   useStaging ? false,
   autoconf,
@@ -31,6 +31,39 @@
   perl,
   python3,
   gitMinimal,
+
+  # Support flags
+  gettextSupport ? false,
+  fontconfigSupport ? false,
+  alsaSupport ? false,
+  gtkSupport ? false,
+  openglSupport ? false,
+  tlsSupport ? false,
+  gstreamerSupport ? false,
+  cupsSupport ? false,
+  dbusSupport ? false,
+  openclSupport ? false,
+  cairoSupport ? false,
+  odbcSupport ? false,
+  netapiSupport ? false,
+  cursesSupport ? false,
+  vaSupport ? false,
+  pcapSupport ? false,
+  v4lSupport ? false,
+  saneSupport ? false,
+  gphoto2Support ? false,
+  krb5Support ? false,
+  pulseaudioSupport ? false,
+  udevSupport ? false,
+  xineramaSupport ? false,
+  vulkanSupport ? false,
+  sdlSupport ? false,
+  usbSupport ? false,
+  mingwSupport ? stdenv.hostPlatform.isDarwin,
+  waylandSupport ? false,
+  x11Support ? false,
+  ffmpegSupport ? false,
+  embedInstallers ? false,
 }:
 
 let
@@ -47,26 +80,23 @@ let
     };
   } ./setup-hook-darwin.sh;
 
-  # Building Wine with these flags isn’t supported on Darwin. Using any of them will result in an evaluation failures
+  # Building Wine with these flags isn't supported on Darwin. Using any of them will result in an evaluation failures
   # because they will put Darwin in `meta.badPlatforms`.
-  darwinUnsupportedFlags = [
-    "alsaSupport"
-    "cairoSupport"
-    "dbusSupport"
-    "fontconfigSupport"
-    "gtkSupport"
-    "netapiSupport"
-    "pulseaudioSupport"
-    "udevSupport"
-    "v4lSupport"
-    "vaSupport"
-    "waylandSupport"
-    "x11Support"
-    "xineramaSupport"
-  ];
-
   badPlatforms = lib.optional (
-    !supportFlags.mingwSupport || lib.any (flag: supportFlags.${flag}) darwinUnsupportedFlags
+    !mingwSupport
+    || alsaSupport
+    || cairoSupport
+    || dbusSupport
+    || fontconfigSupport
+    || gtkSupport
+    || netapiSupport
+    || pulseaudioSupport
+    || udevSupport
+    || v4lSupport
+    || vaSupport
+    || waylandSupport
+    || x11Support
+    || xineramaSupport
   ) "x86_64-darwin";
 
   # Staging patches (from src.staging when useStaging is true)
@@ -101,7 +131,6 @@ stdenv.mkDerivation (
     strictDeps = true;
 
     nativeBuildInputs =
-      with supportFlags;
       lib.optionals useStaging [
         autoconf
         hexdump
@@ -134,7 +163,6 @@ stdenv.mkDerivation (
         )
       )
       ++ toBuildInputs pkgArches (
-        with supportFlags;
         pkgs:
         [
           pkgs.freetype
@@ -242,11 +270,11 @@ stdenv.mkDerivation (
 
     configureFlags =
       prevConfigFlags
-      ++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ]
-      ++ lib.optionals supportFlags.vulkanSupport [ "--with-vulkan" ]
-      ++ lib.optionals (
-        (stdenv.hostPlatform.isDarwin && !supportFlags.xineramaSupport) || !supportFlags.x11Support
-      ) [ "--without-x" ];
+      ++ lib.optionals waylandSupport [ "--with-wayland" ]
+      ++ lib.optionals vulkanSupport [ "--with-vulkan" ]
+      ++ lib.optionals ((stdenv.hostPlatform.isDarwin && !xineramaSupport) || !x11Support) [
+        "--without-x"
+      ];
 
     # Wine locates a lot of libraries dynamically through dlopen().  Add
     # them to the RPATH so that the user doesn't have to set them in
@@ -255,10 +283,10 @@ stdenv.mkDerivation (
       map (path: "-rpath " + path) (
         map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ finalAttrs.buildInputs)
         # libpulsecommon.so is linked but not found otherwise
-        ++ lib.optionals supportFlags.pulseaudioSupport (
+        ++ lib.optionals pulseaudioSupport (
           map (x: "${lib.getLib x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))
         )
-        ++ lib.optionals supportFlags.waylandSupport (
+        ++ lib.optionals waylandSupport (
           map (x: "${lib.getLib x}/share/wayland-protocols") (
             toBuildInputs pkgArches (pkgs: [ pkgs.wayland-protocols ])
           )
@@ -281,13 +309,13 @@ stdenv.mkDerivation (
       let
         links = prefix: pkg: "ln -s ${pkg} $out/${prefix}/${pkg.name}";
       in
-      lib.optionalString supportFlags.embedInstallers ''
+      lib.optionalString embedInstallers ''
         mkdir -p $out/share/wine/gecko $out/share/wine/mono/
         ${lib.strings.concatStringsSep "\n" (
           (map (links "share/wine/gecko") geckos) ++ (map (links "share/wine/mono") monos)
         )}
       ''
-      + lib.optionalString supportFlags.gstreamerSupport ''
+      + lib.optionalString gstreamerSupport ''
         # Wrapping Wine is tricky.
         # https://github.com/NixOS/nixpkgs/issues/63170
         # https://github.com/NixOS/nixpkgs/issues/28486
@@ -320,8 +348,8 @@ stdenv.mkDerivation (
       "bindnow"
       "stackclashprotection"
     ]
-    ++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify"
-    ++ lib.optional (supportFlags.mingwSupport) "format";
+    ++ lib.optional stdenv.hostPlatform.isDarwin "fortify"
+    ++ lib.optional mingwSupport "format";
 
     passthru = {
       inherit pkgArches;
diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix
index 5244bc9ea7e5..ca3f2e9bbc44 100644
--- a/pkgs/applications/emulators/wine/default.nix
+++ b/pkgs/applications/emulators/wine/default.nix
@@ -6,7 +6,7 @@
 # };
 # Make additional configurations on demand:
 # wine.override { wineBuild = "wine32"; wineRelease = "staging"; };
-{
+args@{
   lib,
   stdenv,
   callPackage,
@@ -50,6 +50,18 @@
 let
   sources = callPackage ./sources.nix { };
 
+  supportFlags = lib.filterAttrs (
+    name: _:
+    !builtins.elem name [
+      "lib"
+      "stdenv"
+      "callPackage"
+      "darwin"
+      "wineRelease"
+      "wineBuild"
+    ]
+  ) args;
+
   # Map user-facing release names to sources, pname suffix, and staging flag
   releaseInfo = {
     stable = {
@@ -77,47 +89,7 @@ let
   };
 
   baseWine = lib.getAttr wineBuild (
-    callPackage ./packages.nix (
-      releaseInfo.${wineRelease}
-      // {
-        supportFlags = {
-          inherit
-            alsaSupport
-            cairoSupport
-            cupsSupport
-            cursesSupport
-            dbusSupport
-            embedInstallers
-            fontconfigSupport
-            gettextSupport
-            gphoto2Support
-            gstreamerSupport
-            gtkSupport
-            krb5Support
-            mingwSupport
-            netapiSupport
-            odbcSupport
-            openclSupport
-            openglSupport
-            pcapSupport
-            pulseaudioSupport
-            saneSupport
-            sdlSupport
-            tlsSupport
-            udevSupport
-            usbSupport
-            v4lSupport
-            vaSupport
-            vulkanSupport
-            waylandSupport
-            x11Support
-            ffmpegSupport
-            xineramaSupport
-            ;
-        };
-        inherit moltenvk;
-      }
-    )
+    callPackage ./packages.nix (releaseInfo.${wineRelease} // supportFlags)
   );
 in
 if wineRelease == "yabridge" then
diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix
index af9082a7d8f9..4ca991320cd5 100644
--- a/pkgs/applications/emulators/wine/packages.nix
+++ b/pkgs/applications/emulators/wine/packages.nix
@@ -10,14 +10,14 @@
   src,
   pnameSuffix ? "",
   useStaging ? false,
-  supportFlags,
   # Staging native build deps
   autoconf,
   hexdump,
   perl,
   python3,
   gitMinimal,
-}:
+  ...
+}@args:
 
 let
   inherit (src)
@@ -27,118 +27,110 @@ let
     gecko64
     mono
     ;
+
+  # Args to pass through to base.nix (support flags, etc.)
+  baseArgs = removeAttrs args [
+    "stdenv_32bit"
+    "lib"
+    "pkgs"
+    "pkgsi686Linux"
+    "pkgsCross"
+    "callPackage"
+    "replaceVars"
+  ];
 in
 {
-  wine32 = pkgsi686Linux.callPackage ./base.nix {
-    pname = "wine";
-    inherit
-      src
-      version
-      supportFlags
-      patches
-      moltenvk
-      pnameSuffix
-      useStaging
+  wine32 = pkgsi686Linux.callPackage ./base.nix (
+    baseArgs
+    // {
+      pname = "wine";
+      inherit version patches;
       # Forcing these `nativeBuildInputs` used in the `staging` to come
       # from ambient `pkgs`, rather than being provided by
       # `pkgsi686Linux.callPackage` for that platform.
-      autoconf
-      hexdump
-      perl
-      python3
-      gitMinimal
-      ;
-    pkgArches = [ pkgsi686Linux ];
-    geckos = [ gecko32 ];
-    mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ];
-    monos = [ mono ];
-    platforms = [
-      "i686-linux"
-      "x86_64-linux"
-    ];
-  };
-  wine64 = callPackage ./base.nix {
-    pname = "wine64";
-    inherit
-      src
-      version
-      supportFlags
-      patches
-      moltenvk
-      pnameSuffix
-      useStaging
-      ;
-    pkgArches = [ pkgs ];
-    mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ];
-    geckos = [ gecko64 ];
-    monos = [ mono ];
-    configureFlags = [ "--enable-win64" ];
-    platforms = [
-      "x86_64-linux"
-      "x86_64-darwin"
-    ];
-    mainProgram = "wine";
-  };
-  wineWow = callPackage ./base.nix {
-    pname = "wine-wow";
-    inherit
-      src
-      version
-      supportFlags
-      patches
-      moltenvk
-      pnameSuffix
-      useStaging
-      ;
-    stdenv = stdenv_32bit;
-    pkgArches = [
-      pkgs
-      pkgsi686Linux
-    ];
-    geckos = [
-      gecko32
-      gecko64
-    ];
-    mingwGccs = with pkgsCross; [
-      mingw32.buildPackages.gcc
-      mingwW64.buildPackages.gcc
-    ];
-    monos = [ mono ];
-    buildScript = replaceVars ./builder-wow.sh {
-      # pkgconfig has trouble picking the right architecture
-      pkgconfig64remove = lib.makeSearchPathOutput "dev" "lib/pkgconfig" [
-        pkgs.glib
-        pkgs.gst_all_1.gstreamer
+      inherit
+        autoconf
+        hexdump
+        perl
+        python3
+        gitMinimal
+        ;
+      pkgArches = [ pkgsi686Linux ];
+      geckos = [ gecko32 ];
+      mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ];
+      monos = [ mono ];
+      platforms = [
+        "i686-linux"
+        "x86_64-linux"
       ];
-    };
-    platforms = [ "x86_64-linux" ];
-    mainProgram = "wine";
-  };
-  wineWow64 = callPackage ./base.nix {
-    pname = "wine-wow64";
-    inherit
-      src
-      version
-      patches
-      moltenvk
-      pnameSuffix
-      useStaging
-      ;
-    supportFlags = supportFlags // {
-      mingwSupport = true;
-    }; # Required because we request "--enable-archs=x86_64"
-    pkgArches = [ pkgs ];
-    mingwGccs = with pkgsCross; [
-      mingw32.buildPackages.gcc
-      mingwW64.buildPackages.gcc
-    ];
-    geckos = [ gecko64 ];
-    monos = [ mono ];
-    configureFlags = [ "--enable-archs=x86_64,i386" ];
-    platforms = [
-      "x86_64-linux"
-      "x86_64-darwin"
-    ];
-    mainProgram = "wine";
-  };
+    }
+  );
+  wine64 = callPackage ./base.nix (
+    baseArgs
+    // {
+      pname = "wine64";
+      inherit version patches;
+      pkgArches = [ pkgs ];
+      mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ];
+      geckos = [ gecko64 ];
+      monos = [ mono ];
+      configureFlags = [ "--enable-win64" ];
+      platforms = [
+        "x86_64-linux"
+        "x86_64-darwin"
+      ];
+      mainProgram = "wine";
+    }
+  );
+  wineWow = callPackage ./base.nix (
+    baseArgs
+    // {
+      pname = "wine-wow";
+      inherit version patches;
+      stdenv = stdenv_32bit;
+      pkgArches = [
+        pkgs
+        pkgsi686Linux
+      ];
+      geckos = [
+        gecko32
+        gecko64
+      ];
+      mingwGccs = with pkgsCross; [
+        mingw32.buildPackages.gcc
+        mingwW64.buildPackages.gcc
+      ];
+      monos = [ mono ];
+      buildScript = replaceVars ./builder-wow.sh {
+        # pkgconfig has trouble picking the right architecture
+        pkgconfig64remove = lib.makeSearchPathOutput "dev" "lib/pkgconfig" [
+          pkgs.glib
+          pkgs.gst_all_1.gstreamer
+        ];
+      };
+      platforms = [ "x86_64-linux" ];
+      mainProgram = "wine";
+    }
+  );
+  wineWow64 = callPackage ./base.nix (
+    baseArgs
+    // {
+      pname = "wine-wow64";
+      inherit version patches;
+      mingwSupport = true; # Required because we request "--enable-archs=x86_64"
+      pkgArches = [ pkgs ];
+      mingwGccs = with pkgsCross; [
+        mingw32.buildPackages.gcc
+        mingwW64.buildPackages.gcc
+      ];
+      geckos = [ gecko64 ];
+      monos = [ mono ];
+      configureFlags = [ "--enable-archs=x86_64,i386" ];
+      platforms = [
+        "x86_64-linux"
+        "x86_64-darwin"
+      ];
+      mainProgram = "wine";
+    }
+  );
 }
diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 5ab66bd9ab4c..67d1503b7b78 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "145.0.7632.75",
+    "version": "145.0.7632.109",
     "chromedriver": {
-      "version": "145.0.7632.76",
-      "hash_darwin": "sha256-7bZgvz6yD8qO1G82KTlAuPxLPelZ5TfIlLvyugDJUjM=",
-      "hash_darwin_aarch64": "sha256-fwtLzGyT810JoTKI52jXPGBu2EnrD+ROG1L2kGMfFfk="
+      "version": "145.0.7632.110",
+      "hash_darwin": "sha256-wa8s3PwS5G1TopGYheyLD7wlxxTZWPYwU90TLFpBMZw=",
+      "hash_darwin_aarch64": "sha256-/J4A4DrERlHdlI0Pv9hHCnBGoeUIB6G43fS0Y8taLFs="
     },
     "deps": {
       "depot_tools": {
@@ -21,8 +21,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "ab0b95409566de9da1ed76e690022f774aec7793",
-        "hash": "sha256-VvHDqNTXOFeV+QY3K2O9fTFxDzrkz6qKl9hP8nVDMAw=",
+        "rev": "61eff07de4f37ac1c6969c91034a447ef6cd394d",
+        "hash": "sha256-b498JyyvsN/+0Gqjdrq+eT1HW54/ayEENRHa1Sw69Xw=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -132,8 +132,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "0cf07977de12e7056ab3cbcbf584411e88a1f734",
-        "hash": "sha256-2OgNRRkpUlkyXAQDSOL4279JAi1C0QbH4MEfNW7WieQ="
+        "rev": "d9f5a980bb5a4baeb7d9c1fef89a39789a6cd9fb",
+        "hash": "sha256-DaNsRQm9bR2lfbiP6vWr2R7KD8mYWOaJ72VJyrUkJvI="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -257,8 +257,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "cc75f545bcb65238f74fd291833112305ce6915a",
-        "hash": "sha256-tOE96dcLmUaAVvOo4oGoUrEFpGSH2yxIBtvXSAVzbK0="
+        "rev": "8eb35b80efbc72ffb3aff36c3c1106fe9269df88",
+        "hash": "sha256-fzcXSU0kaIZVTQx1L5A0Xmn3HEzUE35mzfsU0YEaxw0="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -602,8 +602,8 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "3c679253a9e17c10be696d345c63636b18b7f925",
-        "hash": "sha256-OW39m1TVJnSdbeVeTCgSxePTqFTOwWqZIrU/5SEioCc="
+        "rev": "004b47619573a582c076679764e07725ace3e497",
+        "hash": "sha256-PHu3v/ZeEa11/CTGJh8aJjV/lTIVSJ6W7uH2njsHj1w="
       },
       "src/third_party/perfetto": {
         "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
@@ -817,8 +817,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "fffd2bdc35a900b4312833885d9d30803580670e",
-        "hash": "sha256-WqSGzOCvLw6k3t1oNgZV17KY8TVl6j4lJr0NZSVbm4o="
+        "rev": "a8b42c8fae7c7f1ce4e32b08ee61c22775185c01",
+        "hash": "sha256-HZ4JbSoMNVqUrCWoxk0/AxzlcpMgKhe/HJ7DGeTeE9M="
       }
     }
   },
diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
index 9d56a9493aa5..f0fc2f8514c8 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
   pname = "firefox-devedition";
   binaryName = "firefox-devedition";
-  version = "148.0b14";
+  version = "148.0b15";
   applicationName = "Firefox Developer Edition";
   requireSigning = false;
   branding = "browser/branding/aurora";
   src = fetchurl {
     url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "10de6926c3c20fcbffe2f25f97213ac777e4ce3984cb303262ddaef15be24788a40c6064ce8cc138ab3a35ba621efdcd0f6e0a105b2e773f7f14a1d661c10693";
+    sha512 = "32d7e4b9df739d5bdab2cd54250b1c7546d26b248a62e0bbc71e4b78b12d4e3d6d9451b631a0f18568f2540141786967a33b6543256a6ec6f4f245093d37a5d5";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 8ff28a6b10d8..0a1eca0e16c4 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -27,13 +27,13 @@
     "vendorHash": null
   },
   "aiven_aiven": {
-    "hash": "sha256-Aih7prC6CKv414bxiJnV3PFXZfH0MxsmS2g9c4eVWOk=",
+    "hash": "sha256-lNDorhkIngyZ8S51lyuI3LRtnFtzVG01Nzo1vRPytbQ=",
     "homepage": "https://registry.terraform.io/providers/aiven/aiven",
     "owner": "aiven",
     "repo": "terraform-provider-aiven",
-    "rev": "v4.50.0",
+    "rev": "v4.51.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-S2QbhaK7GlfUnggLE9wNNJCrNnk5ReD7kY8yeRKPi7Q="
+    "vendorHash": "sha256-c4eCY/iQ8v/gBX55j22TRxWIeoevi5EJs4TtN9xXfKA="
   },
   "akamai_akamai": {
     "hash": "sha256-WXIx2/1EiamjolyPy+d3Gwp4hOguJrmxKwgLZqzQqDg=",
@@ -63,14 +63,14 @@
     "vendorHash": "sha256-AO6reoqxDcPAMXKlqjJLGmhsgFrekaQXjMPm9fxhpFA="
   },
   "argoproj-labs_argocd": {
-    "hash": "sha256-xIEl9SsiwJp3X7hyVPE/Z9qHGTL9ZotvzIz7Zx5bdEc=",
+    "hash": "sha256-2QatWxaR5lO4+0RxUMOQjyLp8XG6O0vwCYc8jHKL+48=",
     "homepage": "https://registry.terraform.io/providers/argoproj-labs/argocd",
     "owner": "argoproj-labs",
     "proxyVendor": true,
     "repo": "terraform-provider-argocd",
-    "rev": "v7.12.5",
+    "rev": "v7.13.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-gVzj5x95MNgCbxwqiqakrUnhF/x+vXnAurv4pUt8kV4="
+    "vendorHash": "sha256-OBXAl3MRAtnYYATHD0UWEuB1dJozG7al9csGYLClaYw="
   },
   "auth0_auth0": {
     "hash": "sha256-d93MvkFn2+slFh2yvllcwthVTY15ezLn+q8Jm3MPQ+0=",
@@ -580,13 +580,13 @@
     "vendorHash": "sha256-lhTdDrTwTbRuWngQ+NGuh+x5Z5HZfVTtNi+mZqIENbg="
   },
   "hashicorp_google-beta": {
-    "hash": "sha256-NRTnx5nqdCtjz0mGZjuA96jEzW1rKR+M0AY2//TAYk4=",
+    "hash": "sha256-frRtwDdgNNux875U9rgSbZict8//X/WzxM7EBSxRqW4=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
     "owner": "hashicorp",
     "repo": "terraform-provider-google-beta",
-    "rev": "v7.18.0",
+    "rev": "v7.20.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-/wClcz8fwl9Of2JSKcfETs7VR6c5KrYnnF+yW5iUoSU="
+    "vendorHash": "sha256-KnB6R5yrEeaf4Z+LzQjCeQJjAgHK0kJEJzT1rb3pimY="
   },
   "hashicorp_helm": {
     "hash": "sha256-S4Fe65f+gEWWxRMC+/i93dwwe7QigPccx4wiqNBpcL8=",
@@ -652,13 +652,13 @@
     "vendorHash": "sha256-GlkqFg9Bgs+Hi59PYAxqq3YW9ji1qeuX4vz59wQ4pRw="
   },
   "hashicorp_tfe": {
-    "hash": "sha256-U58uWRmLMI9XfYT89wfNuwhok+PaWCanz23RjQYyL98=",
+    "hash": "sha256-+FIiatVTff/MNk1Ik0vZDii7yjeWQLO5BLqSrs2bGME=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
     "owner": "hashicorp",
     "repo": "terraform-provider-tfe",
-    "rev": "v0.73.0",
+    "rev": "v0.74.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-n+by9Z0JhLOk/td8Or5IUQIapy9TTHnf9QJSVddTL2Y="
+    "vendorHash": "sha256-GAwAGw8N4B/jCtcR2ok3g/0j//CHK9yPaBj+otJLjKc="
   },
   "hashicorp_time": {
     "hash": "sha256-ZArYfbzbrkxGlL1BRFM7PN3hLzdssIL4COsUBdLVMYY=",
@@ -1418,13 +1418,13 @@
     "vendorHash": null
   },
   "vancluever_acme": {
-    "hash": "sha256-Fjn1eNqB0Ye5MRg8+YsPwMBdkvsVELTzf2wvHluFzN8=",
+    "hash": "sha256-hviw2syXALi3B47jwfvEn61sOOZ1qvUMWJE7Ob6M36U=",
     "homepage": "https://registry.terraform.io/providers/vancluever/acme",
     "owner": "vancluever",
     "repo": "terraform-provider-acme",
-    "rev": "v2.43.0",
+    "rev": "v2.44.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-LAM2pzTIRdspYnXboDA+iGwt7uaI+/ItXPAgOJUELps="
+    "vendorHash": "sha256-FSyJ5ZCaGbMZbDop/Pj8TKaUAeOBNz/RSfV/rkVYbD0="
   },
   "venafi_venafi": {
     "hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=",
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 2541fb2b871e..2a05f192c7f8 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -39,6 +39,12 @@ let
           inherit hash;
         };
 
+        # Set CGO_ENABLED based on platform:
+        # - Linux: CGO_ENABLED=0 for static linking (avoids LTO plugin issues)
+        # - Darwin: CGO_ENABLED=1 to avoid DNS resolution issues
+        # See: https://github.com/hashicorp/terraform/blob/main/BUILDING.md
+        env.CGO_ENABLED = if stdenv.hostPlatform.isDarwin then "1" else "0";
+
         ldflags = [
           "-s"
           "-w"
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index 68004fa0dd3d..63aed1a79728 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -65,8 +65,8 @@ rec {
   thunderbird = thunderbird-latest;
 
   thunderbird-latest = common {
-    version = "147.0.1";
-    sha512 = "bae9adbcb1d45a7644e4d699215a3da85b612b9d99516bdf12f84482f1a6f89153ec4d5ab6dd8bcf69dc512cb50080db4630a5bb52525f22213c7af92b4b77d7";
+    version = "147.0.2";
+    sha512 = "4fe6d0389e8bc6078b3d4db79d1f8547666950de4a5a72e49ba24d5b60cb531908b88efa9f3dd32e154ee917a8b80786389ce9b1186b6c45fb0717d4e180e537";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-latest";
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
index 408d275c8a2d..5942037f861a 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     description = "Pass mouse wheel commands to secondary screens (screen, less, nano, etc)";
     homepage = "https://aur.archlinux.org/packages/urxvt-vtwheel";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ danbst ];
+    maintainers = [ ];
     platforms = with lib.platforms; unix;
   };
 
diff --git a/pkgs/build-support/docker/make-layers.nix b/pkgs/build-support/docker/make-layers.nix
index 0c13673ee7b0..9d8bdcd539f3 100644
--- a/pkgs/build-support/docker/make-layers.nix
+++ b/pkgs/build-support/docker/make-layers.nix
@@ -1,6 +1,6 @@
 {
   coreutils,
-  flattenReferencesGraph,
+  flatten-references-graph,
   lib,
   jq,
   runCommand,
@@ -26,7 +26,7 @@ else
       inherit pipeline;
       nativeBuildInputs = [
         coreutils
-        flattenReferencesGraph
+        flatten-references-graph
         jq
       ];
     }
diff --git a/pkgs/build-support/fetchitchio/default.nix b/pkgs/build-support/fetchitchio/default.nix
new file mode 100644
index 000000000000..186c25f8542f
--- /dev/null
+++ b/pkgs/build-support/fetchitchio/default.nix
@@ -0,0 +1,115 @@
+{
+  lib,
+  stdenvNoCC,
+  python3,
+}:
+
+lib.extendMkDerivation {
+  constructDrv = stdenvNoCC.mkDerivation;
+  excludeDrvArgNames = [
+    "derivationArgs"
+    "sha1"
+    "sha256"
+    "sha512"
+  ];
+  extendDrvArgs =
+    finalAttrs:
+    lib.fetchers.withNormalizedHash { } (
+      {
+
+        endpoint ? "https://api.itch.io",
+
+        # The name of the environment variable that contains the itch.io API key.
+        # The environment variable needs to be set for the nix building process,
+        # which is nix-daemon for multi-user mode.
+        apiKeyVar ? "NIX_ITCHIO_API_KEY",
+
+        # The game store page URL in the format of https://{author}.itch.io/{game}
+        gameUrl,
+
+        # The upload ID of the downloadable file.
+        # To get the upload ID, look at the request URL when you download it.
+        upload,
+
+        # Derivation name.
+        name ? null,
+
+        # The extra message printed when the API key is not provided
+        # or when the account of the API key did not purchase the game.
+        extraMessage ? null,
+
+        # Show the download URL without actually downloading it, for testing purposes.
+        # Notice that this can potentially leak the API key.
+        showUrl ? false,
+
+        outputHash ? lib.fakeHash,
+        outputHashAlgo ? null,
+        preFetch ? "",
+        postFetch ? "",
+        nativeBuildInputs ? [ ],
+        impureEnvVars ? [ ],
+        passthru ? { },
+        meta ? { },
+        preferLocalBuild ? true,
+        derivationArgs ? { },
+      }:
+      let
+        finalHashHasColon = lib.hasInfix ":" finalAttrs.hash;
+        finalHashColonMatch = lib.match "([^:]+)[:](.*)" finalAttrs.hash;
+      in
+      derivationArgs
+      // {
+        __structuredAttrs = true;
+
+        name = if name != null then name else baseNameOf gameUrl;
+
+        hash =
+          if outputHashAlgo == null || outputHash == "" || lib.hasPrefix outputHashAlgo outputHash then
+            outputHash
+          else
+            "${outputHashAlgo}:${outputHash}";
+        outputHash =
+          if finalAttrs.hash == "" then
+            lib.fakeHash
+          else if finalHashHasColon then
+            lib.elemAt finalHashColonMatch 1
+          else
+            finalAttrs.hash;
+        outputHashAlgo = if finalHashHasColon then lib.head finalHashColonMatch else null;
+        outputHashMode = "flat";
+
+        nativeBuildInputs = [ python3 ] ++ nativeBuildInputs;
+
+        inherit preferLocalBuild;
+
+        # ENV
+        nixpkgsVersion = lib.trivial.release;
+        uploadName = name;
+        inherit
+          endpoint
+          apiKeyVar
+          gameUrl
+          extraMessage
+          showUrl
+          preFetch
+          postFetch
+          ;
+        impureEnvVars =
+          lib.fetchers.proxyImpureEnvVars
+          ++ [
+            apiKeyVar
+            "NIX_CONNECT_TIMEOUT"
+          ]
+          ++ impureEnvVars;
+
+        builder = builtins.toFile "builder.sh" ''
+          source "$NIX_ATTRS_SH_FILE"
+          runHook preFetch
+          python ${./fetchitchio.py}
+          runHook postFetch
+        '';
+      }
+    );
+
+  inheritFunctionArgs = false;
+}
diff --git a/pkgs/build-support/fetchitchio/fetchitchio.py b/pkgs/build-support/fetchitchio/fetchitchio.py
new file mode 100644
index 000000000000..7e2a18f0df62
--- /dev/null
+++ b/pkgs/build-support/fetchitchio/fetchitchio.py
@@ -0,0 +1,76 @@
+import itertools
+import json
+import os
+import platform
+import shutil
+import sys
+import urllib.error
+import urllib.parse
+import urllib.request
+
+with open(os.environ['NIX_ATTRS_JSON_FILE']) as env_file:
+    ENV = json.load(env_file)
+
+USER_AGENT = f'Python/{platform.python_version()} Nixpkgs/{ENV['nixpkgsVersion']}'
+TIMEOUT = float(os.environ.get('NIX_CONNECT_TIMEOUT') or '15')
+
+ENDPOINT = ENV['endpoint']
+GAME_URL = ENV['gameUrl']
+UPLOAD_ID = ENV['upload']
+
+def abort(message):
+    if 'extraMessage' in ENV:
+        message = f'{message} {ENV['extraMessage']}'
+    print(message, file=sys.stderr)
+    sys.exit(1)
+
+try:
+    API_KEY = os.environ[ENV['apiKeyVar']]
+except KeyError:
+    abort(
+        f'Either set {ENV['apiKeyVar']} for the nix building process '
+        f'or manually download {ENV.get('uploadName', 'the required file')} '
+        f'from {GAME_URL} and add it to nix store.'
+    )
+
+def urlopen(url_or_request):
+    return urllib.request.urlopen(url_or_request, timeout=TIMEOUT)
+
+with urlopen(f'{GAME_URL}/data.json') as response:
+    data = json.load(response)
+    GAME_ID = data['id']
+    IS_FREE = 'price' not in data
+
+def api(path, params={}, download=False):
+    url = f'{ENDPOINT}{path}?{urllib.parse.urlencode({'api_key': API_KEY, **params})}'
+    if download and ENV['showUrl']:
+        with open(os.environ['out'], 'w') as output_file:
+            print(url, file=output_file)
+        return
+    request = urllib.request.Request(url, headers={'User-Agent': USER_AGENT})
+    with urlopen(request) as response:
+        if download:
+            with open(os.environ['out'], 'wb') as output_file:
+                shutil.copyfileobj(response, output_file)
+        else:
+            return json.load(response)
+
+if IS_FREE:
+    api(f'/uploads/{UPLOAD_ID}/download', download=True)
+    sys.exit()
+
+KEY_ID = None
+for page in itertools.count(1):
+    data = api('/profile/owned-keys', {'page': page})
+    if 'owned_keys' not in data:
+        break
+    for key in data['owned_keys']:
+        if key['game_id'] == GAME_ID:
+            KEY_ID = key['id']
+            break
+    if len(data['owned_keys']) < data['per_page']:
+        break
+if not KEY_ID:
+    abort(f'Cannot find a key associated with {GAME_URL}. Did you buy the game?')
+
+api(f'/uploads/{UPLOAD_ID}/download', {'download_key_id': KEY_ID}, download=True)
diff --git a/pkgs/build-support/node/prefetch-npm-deps/src/main.rs b/pkgs/build-support/node/prefetch-npm-deps/src/main.rs
index 5ab0413cdcad..2882aee9ec20 100644
--- a/pkgs/build-support/node/prefetch-npm-deps/src/main.rs
+++ b/pkgs/build-support/node/prefetch-npm-deps/src/main.rs
@@ -67,6 +67,20 @@ const ALLOWED_VERSION_FIELDS: &[&str] = &[
     "scripts",
 ];
 
+/// Allowed fields in `dist` sub-objects.
+///
+/// Only fields that npm reads during `npm install` are included.
+/// Excluded volatile fields:
+///   - `signatures`: changes when npm rotates registry signing keys
+///   - `npm-signature`: legacy signature format, also mutable
+///   - `attestations`: provenance attestations, can be added/updated post-publish
+///   - `fileCount`, `unpackedSize`: informational only, not used during install
+const ALLOWED_DIST_FIELDS: &[&str] = &[
+    "tarball",   // URL to download the package tarball
+    "integrity", // SRI hash for verification (e.g., sha512-...)
+    "shasum",    // SHA-1 fallback hash for older lockfiles
+];
+
 fn normalize_packument(
     package_name: &str,
     data: &[u8],
@@ -91,6 +105,12 @@ fn normalize_packument(
         for version_val in versions.values_mut() {
             if let Some(version_obj) = version_val.as_object_mut() {
                 version_obj.retain(|key, _| ALLOWED_VERSION_FIELDS.contains(&key.as_str()));
+
+                // Normalize the dist sub-object to strip volatile fields
+                // (signatures, npm-signature, attestations, fileCount, unpackedSize)
+                if let Some(Value::Object(dist_obj)) = version_obj.get_mut("dist") {
+                    dist_obj.retain(|key, _| ALLOWED_DIST_FIELDS.contains(&key.as_str()));
+                }
             }
         }
     }
diff --git a/pkgs/by-name/ab/ablog/package.nix b/pkgs/by-name/ab/ablog/package.nix
index 6fc85d7e62a2..77249f635f79 100644
--- a/pkgs/by-name/ab/ablog/package.nix
+++ b/pkgs/by-name/ab/ablog/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.11.12";
+  version = "0.11.13";
 in
 python3Packages.buildPythonApplication {
   pname = "ablog";
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication {
     owner = "sunpy";
     repo = "ablog";
     tag = "v${version}";
-    hash = "sha256-bPTaxkuIKeypfnZItG9cl51flHBIx/yg0qENuiqQgY4=";
+    hash = "sha256-P1eSN3wqlPNYbYW3Rkz2Y6yFcC379dt/qK8aVNwZRSs=";
   };
 
   build-system = with python3Packages; [
@@ -43,7 +43,6 @@ python3Packages.buildPythonApplication {
 
   pytestFlags = [
     "--rootdir=src/ablog"
-    "-Wignore::sphinx.deprecation.RemovedInSphinx90Warning" # Ignore ImportError
   ];
 
   disabledTests = [
diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/by-name/ad/adwaita-qt/package.nix
similarity index 84%
rename from pkgs/data/themes/adwaita-qt/default.nix
rename to pkgs/by-name/ad/adwaita-qt/package.nix
index aa80c27297ad..7f2ea1b256f1 100644
--- a/pkgs/data/themes/adwaita-qt/default.nix
+++ b/pkgs/by-name/ad/adwaita-qt/package.nix
@@ -5,14 +5,16 @@
   nix-update-script,
   cmake,
   ninja,
-  qtbase,
-  qtwayland,
   qt5,
+  qt6,
   libxcb,
   useQt6 ? false,
 }:
+let
+  qt = if useQt6 then qt6 else qt5;
+in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "adwaita-qt";
   version = "1.4.2";
 
@@ -24,8 +26,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FedoraQt";
     repo = "adwaita-qt";
-    rev = version;
-    sha256 = "sha256-K/+SL52C+M2OC4NL+mhBnm/9BwH0KNNTGIDmPwuUwkM=";
+    tag = finalAttrs.version;
+    hash = "sha256-K/+SL52C+M2OC4NL+mhBnm/9BwH0KNNTGIDmPwuUwkM=";
   };
 
   nativeBuildInputs = [
@@ -34,7 +36,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    qtbase
+    qt.qtbase
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libxcb
@@ -43,7 +45,7 @@ stdenv.mkDerivation rec {
     qt5.qtx11extras
   ]
   ++ lib.optionals useQt6 [
-    qtwayland
+    qt6.qtwayland
   ];
 
   # Qt setup hook complains about missing `wrapQtAppsHook` otherwise.
@@ -70,4 +72,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/al/albert/package.nix b/pkgs/by-name/al/albert/package.nix
index 8515d41ddf8b..93f07e97ad98 100644
--- a/pkgs/by-name/al/albert/package.nix
+++ b/pkgs/by-name/al/albert/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "albert";
-  version = "34.0.5";
+  version = "34.0.10";
 
   src = fetchFromGitHub {
     owner = "albertlauncher";
     repo = "albert";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DwFU3hb63Lf9Etr/I1lQ0SpkHfB1hRI+8V0ILk5a2C0=";
+    hash = "sha256-Ryjv8oLUXxK9iOa4ed1lDEbMM7nRj9I02gVT0JNHonQ=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
index 14b448863dfa..42380081cb39 100644
--- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2026-02-10";
+  version = "0-unstable-2026-02-18";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "061314309227b08b5acf8ff2963fc3ce976539e9";
-    hash = "sha256-Kn+m6evpaB4r/a11+6ItfhnCveB8iC6ZJGgkvvPWulc=";
+    rev = "e9108a0d71d7197d42f0315d8bc72147737ebc4a";
+    hash = "sha256-SgcmCsHnZtsMzYeVfb4tUkm9+KARVTZP+weOLHoYdtc=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/ar/arduinoOTA/package.nix b/pkgs/by-name/ar/arduino-ota/package.nix
similarity index 85%
rename from pkgs/by-name/ar/arduinoOTA/package.nix
rename to pkgs/by-name/ar/arduino-ota/package.nix
index e6ab848431c8..d296a6ef4a61 100644
--- a/pkgs/by-name/ar/arduinoOTA/package.nix
+++ b/pkgs/by-name/ar/arduino-ota/package.nix
@@ -5,7 +5,7 @@
   nix-update-script,
 }:
 buildGoModule (finalAttrs: {
-  pname = "arduinoOTA";
+  pname = "arduino-ota";
   version = "1.4.1";
 
   src = fetchFromGitHub {
@@ -19,7 +19,7 @@ buildGoModule (finalAttrs: {
 
   postPatch = ''
     substituteInPlace version/version.go \
-      --replace 'versionString        = ""' 'versionString        = "${finalAttrs.version}"'
+      --replace-fail 'versionString        = ""' 'versionString        = "${finalAttrs.version}"'
   '';
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix
index 35d801df0f95..3035c88fc08f 100644
--- a/pkgs/by-name/ar/arrow-cpp/package.nix
+++ b/pkgs/by-name/ar/arrow-cpp/package.nix
@@ -69,8 +69,8 @@ let
     name = "arrow-testing";
     owner = "apache";
     repo = "arrow-testing";
-    rev = "9a02925d1ba80bd493b6d4da6e8a777588d57ac4";
-    hash = "sha256-dEFCkeQpQrU61uCwJp/XB2umbQHjXtzado36BGChoc0=";
+    rev = "19dda67f485ffb3ffa92f4c6fa083576ef052d58";
+    hash = "sha256-mna6I/a5ZxMLdWN0QfCsgsre6yMeuSv4syX5ePGLhfg=";
   };
 
   parquet-testing = fetchFromGitHub {
@@ -81,7 +81,7 @@ let
     hash = "sha256-Xd6o3RT6Q0tPutV77J0P1x3F6U3RHdCBOKGUKtkQCKk=";
   };
 
-  version = "22.0.0";
+  version = "23.0.0";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "arrow-cpp";
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "apache";
     repo = "arrow";
     rev = "apache-arrow-${version}";
-    hash = "sha256-i4Smt43oi4sddUt3qH7ePjensBSfPW+w/ExLVcVNKic=";
+    hash = "sha256-BluUlbtGJwvlrpN/c/KziOfFh5dvzZyuCy4JZkkFea4=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/cpp";
@@ -120,8 +120,8 @@ stdenv.mkDerivation (finalAttrs: {
       ARROW_XSIMD_URL = fetchFromGitHub {
         owner = "xtensor-stack";
         repo = "xsimd";
-        tag = "13.0.0";
-        hash = "sha256-qElJYW5QDj3s59L3NgZj5zkhnUMzIP2mBa1sPks3/CE=";
+        tag = "14.0.0";
+        hash = "sha256-ijNoHb6xC+OHJbUB4j1PRsoHMzjrnOHVoDRe/nKguDo=";
       };
 
       ARROW_SUBSTRAIT_URL = fetchFromGitHub {
diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix
index a55c5cad8a49..395a24864409 100644
--- a/pkgs/by-name/at/atuin/package.nix
+++ b/pkgs/by-name/at/atuin/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "atuin";
-  version = "18.11.0";
+  version = "18.12.0";
 
   src = fetchFromGitHub {
     owner = "atuinsh";
     repo = "atuin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yjsCNN15E06te6cueSZksg7mcMyx2FiXKrbGAEcQWmg=";
+    hash = "sha256-nubhaIxVpVDiiNxX2InbhmYBkk/fMO0i9XrJgtJxD1o=";
   };
 
-  cargoHash = "sha256-xaALIVJpMek4nbSozxtOEWivRDlMmKdu6KqKiNMp0jk=";
+  cargoHash = "sha256-ZBqZhWQ5tPhfWDtJ8/7oVR1EoP+MrF55ofUQZ5qUpAw=";
 
   # atuin's default features include 'check-updates', which do not make sense
   # for distribution builds. List all other default features.
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildFeatures = [
     "client"
     "sync"
-    "server"
     "clipboard"
     "daemon"
   ];
diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix
index 9459f19b2745..e5731c8d83ef 100644
--- a/pkgs/by-name/au/auth0-cli/package.nix
+++ b/pkgs/by-name/au/auth0-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "auth0-cli";
-  version = "1.27.0";
+  version = "1.27.2";
 
   src = fetchFromGitHub {
     owner = "auth0";
     repo = "auth0-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DrQCbuVFfbhobF3lppQg/a0J/ZSMuP+wbLrMsLcKSRE=";
+    hash = "sha256-Se3jLcMU+KDkaF5UY18KWs/Q+YK3782e7cKc9BxaYqY=";
   };
 
   vendorHash = "sha256-Us6NJiSfOK1BBRyrYil26HGaZAgum6k3B5LdV60rCeA=";
diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix
index bc8dfbc8a694..fe75c939e0d2 100644
--- a/pkgs/by-name/au/autosuspend/package.nix
+++ b/pkgs/by-name/au/autosuspend/package.nix
@@ -11,7 +11,7 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "autosuspend";
-  version = "10.0.0";
+  version = "10.1.0";
   pyproject = true;
 
   outputs = [
@@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     owner = "languitar";
     repo = "autosuspend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-o9Jpb4i2/SJ3s3h5sclNjpaN/UFk1YbpPf7b3rGXLRg=";
+    hash = "sha256-4mByuJ75hd5TEoKxVglAHlYXZSlbAldMwnIianSw8O4=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix
index bec04b6ac281..c227e6892718 100644
--- a/pkgs/by-name/aw/aws-vault/package.nix
+++ b/pkgs/by-name/aw/aws-vault/package.nix
@@ -10,17 +10,17 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "aws-vault";
-  version = "7.9.4";
+  version = "7.9.5";
 
   src = fetchFromGitHub {
     owner = "ByteNess";
     repo = "aws-vault";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Tdi2kGoJ0ZwEnBvjkjZuoTTIdmsJjdMi75gwBmy+5N4=";
+    hash = "sha256-MVeYKeFpGKk0asO7u5RE3arpX3x4EpF4xRCav5oj9J4=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-rY7UbAgv+dLnZBLFptPp7D+gYBsCj7QYM4VvH/HBdq4=";
+  vendorHash = "sha256-6JgcU+NRQSQjoGxF0ByaY2h9/HZUdg8BdbHazz5m8VM=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix
index a0248bb508ca..d1c532ad3f8c 100644
--- a/pkgs/by-name/az/azurehound/package.nix
+++ b/pkgs/by-name/az/azurehound/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "azurehound";
-  version = "2.9.1";
+  version = "2.9.2";
 
   src = fetchFromGitHub {
     owner = "SpecterOps";
     repo = "AzureHound";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/ene4POMlqpSFixbD7uzubmOmI/IOPgJbzEQV2dq1gU=";
+    hash = "sha256-bTg/XYPrV9+319e704Hmc4JdpvdiqNqY6XmCxogJbno=";
   };
 
   vendorHash = "sha256-+iNFWKFNON4HX2mf4O29zAdElEkIGIx55Wi9MRtg1dg=";
diff --git a/pkgs/by-name/b4/b43FirmwareCutter/no-root-install.patch b/pkgs/by-name/b4/b43-fwcutter/no-root-install.patch
similarity index 100%
rename from pkgs/by-name/b4/b43FirmwareCutter/no-root-install.patch
rename to pkgs/by-name/b4/b43-fwcutter/no-root-install.patch
diff --git a/pkgs/by-name/b4/b43FirmwareCutter/package.nix b/pkgs/by-name/b4/b43-fwcutter/package.nix
similarity index 87%
rename from pkgs/by-name/b4/b43FirmwareCutter/package.nix
rename to pkgs/by-name/b4/b43-fwcutter/package.nix
index b590b3ab6408..139757343a61 100644
--- a/pkgs/by-name/b4/b43FirmwareCutter/package.nix
+++ b/pkgs/by-name/b4/b43-fwcutter/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Firmware extractor for cards supported by the b43 kernel module";
     mainProgram = "b43-fwcutter";
-    homepage = "http://wireless.kernel.org/en/users/Drivers/b43";
+    homepage = "https://wireless.docs.kernel.org/en/latest/en/users/drivers/b43.html";
     license = lib.licenses.bsd2;
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ba/bashSnippets/package.nix b/pkgs/by-name/ba/bash-snippets/package.nix
similarity index 91%
rename from pkgs/by-name/ba/bashSnippets/package.nix
rename to pkgs/by-name/ba/bash-snippets/package.nix
index 577a479e5e94..4c6795f5c4b0 100644
--- a/pkgs/by-name/ba/bashSnippets/package.nix
+++ b/pkgs/by-name/ba/bash-snippets/package.nix
@@ -11,7 +11,6 @@
   gitMinimal,
 }:
 let
-  version = "1.23.0";
   deps = lib.makeBinPath [
     curl
     python3
@@ -21,14 +20,14 @@ let
     gitMinimal
   ];
 in
-stdenv.mkDerivation {
-  pname = "bashSnippets";
-  inherit version;
+stdenv.mkDerivation (finalAttrs: {
+  pname = "bash-snippets";
+  version = "1.23.0";
 
   src = fetchFromGitHub {
     owner = "alexanderepstein";
     repo = "Bash-Snippets";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "044nxgd3ic2qr6hgq5nymn3dyf5i4s8mv5z4az6jvwlrjnvbg8cp";
   };
 
@@ -58,4 +57,4 @@ stdenv.mkDerivation {
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/ba/bazecor/package.nix b/pkgs/by-name/ba/bazecor/package.nix
index 62a80d461b6a..2b9aa00f1d90 100644
--- a/pkgs/by-name/ba/bazecor/package.nix
+++ b/pkgs/by-name/ba/bazecor/package.nix
@@ -44,7 +44,7 @@ appimageTools.wrapAppImage {
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
 
     install -m 444 -D ${src}/Bazecor.desktop -t $out/share/applications
-    install -m 444 -D ${src}/bazecor.png -t $out/share/pixmaps
+    install -m 444 -D ${src}/bazecor.png -t $out/share/icons/hicolor/512x512/apps
 
     mkdir -p $out/lib/udev/rules.d
     install -m 444 -D ${./60-dygma.rules} $out/lib/udev/rules.d/60-dygma.rules
diff --git a/pkgs/by-name/bi/bisq2/package.nix b/pkgs/by-name/bi/bisq2/package.nix
index 6e8e2073dc0c..6118b432d20d 100644
--- a/pkgs/by-name/bi/bisq2/package.nix
+++ b/pkgs/by-name/bi/bisq2/package.nix
@@ -24,7 +24,7 @@
 }:
 
 let
-  version = "2.1.7";
+  version = "2.1.9";
 
   jdk = zulu25.override { enableJavaFX = true; };
 
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   # nixpkgs-update: no auto update
   src = fetchurl {
     url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb";
-    hash = "sha256-kNQbTZoHFR2qFw/Jjc9iaEews/oUOYoJanmbVH/vs44=";
+    hash = "sha256-E7GV4YGbF0Nj6aWVqJNUUpwLH1G5v5bEQamHP7OUzQY=";
 
     # Verify the upstream Debian package prior to extraction.
     # See https://bisq.wiki/Bisq_2#Installation
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: rec {
 
   signature = fetchurl {
     url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb.asc";
-    hash = "sha256-Cl9EIp+ycD8Tp/bx5dXQK206jZzrYJkI/U9ItfXDRWw=";
+    hash = "sha256-bNZNRbm9uNGfLzGvshXNaRLUNX38Uz58GGy6WqJwV1E=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bl/bluebubbles/package.nix b/pkgs/by-name/bl/bluebubbles/package.nix
index 4f7d48334438..777f06610383 100644
--- a/pkgs/by-name/bl/bluebubbles/package.nix
+++ b/pkgs/by-name/bl/bluebubbles/package.nix
@@ -54,7 +54,7 @@ flutter329.buildFlutterApplication rec {
   postInstall = ''
     sed -i 's#Icon=.*/bluebubbles.png#Icon=bluebubbles#g' snap/gui/bluebubbles.desktop
     install -Dm0644 snap/gui/bluebubbles.desktop $out/share/applications/bluebubbles.desktop
-    install -Dm0644 snap/gui/bluebubbles.png $out/share/pixmaps/bluebubbles.png
+    install -Dm0644 snap/gui/bluebubbles.png -t $out/share/icons/hicolor/1024x1024/apps
   '';
 
   extraWrapProgramArgs = ''
diff --git a/pkgs/by-name/bo/boilr/package.nix b/pkgs/by-name/bo/boilr/package.nix
index 9708c601a424..72b2765b4048 100644
--- a/pkgs/by-name/bo/boilr/package.nix
+++ b/pkgs/by-name/bo/boilr/package.nix
@@ -60,7 +60,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
   postInstall = ''
     patchelf --add-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/boilr
     install -Dpm 0644 flatpak/io.github.philipk.boilr.desktop $out/share/applications/boilr.desktop
-    install -Dpm 0644 resources/io.github.philipk.boilr.png $out/share/pixmaps/io.github.philipk.boilr.png
+    install -Dpm 0644 resources/io.github.philipk.boilr.png -t $out/share/icons/hicolor/32x32/apps
   '';
 
   dontPatchELF = true;
diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index 4c7420b311c2..a398b4b1ae4a 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -21,13 +21,13 @@
 
 buildNpmPackage rec {
   pname = "bruno";
-  version = "3.0.2";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "usebruno";
     repo = "bruno";
     tag = "v${version}";
-    hash = "sha256-lvv1SJuUxNwukg/yi6mhgvVs8M/Eyf2H36NJN+6XKSE=";
+    hash = "sha256-XoGD8lDc6QGka17KTvVX3gEj1fo+4NWpUM8mLA5F+i4=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json
@@ -36,7 +36,7 @@ buildNpmPackage rec {
 
   nodejs = nodejs_22;
 
-  npmDepsHash = "sha256-zb0oP4/L7449z83tpcT6W/6sXS4Urph3ELN9kUC32dA=";
+  npmDepsHash = "sha256-XJsQFyi448yoRM8pUvaNpGDIZ41q0vpwYTgJufBBu1g=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bu/bugdom/package.nix b/pkgs/by-name/bu/bugdom/package.nix
index a3d3054f3a96..c2f40e2c262e 100644
--- a/pkgs/by-name/bu/bugdom/package.nix
+++ b/pkgs/by-name/bu/bugdom/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
         install -Dm755 {.,$out/bin}/Bugdom
         wrapProgram $out/bin/Bugdom --run "cd $out/share/bugdom"
         install -Dm644 $src/packaging/io.jor.bugdom.desktop $out/share/applications/io.jor.bugdom.desktop
-        install -Dm644 $src/packaging/io.jor.bugdom.png $out/share/pixmaps/io.jor.bugdom.png
+        install -Dm644 $src/packaging/io.jor.bugdom.png -t $out/share/icons/hicolor/512x512/apps
       ''
   )
   + ''
diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix
index 9b59be0c76ba..449301d0bc86 100644
--- a/pkgs/by-name/bu/burpsuite/package.nix
+++ b/pkgs/by-name/bu/burpsuite/package.nix
@@ -87,8 +87,8 @@ buildFHSEnv {
     ];
 
   extraInstallCommands = ''
-    mkdir -p "$out/share/pixmaps"
-    ${lib.getBin unzip}/bin/unzip -p ${src} resources/Media/icon64${product.productName}.png > "$out/share/pixmaps/burpsuite.png"
+    mkdir -p "$out/share/icons/hicolor/64x64/apps"
+    ${lib.getBin unzip}/bin/unzip -p ${src} resources/Media/icon64${product.productName}.png > "$out/share/icons/hicolor/64x64/apps/burpsuite.png"
     cp -r ${desktopItem}/share/applications $out/share
   '';
 
diff --git a/pkgs/by-name/ca/cargo-lambda/package.nix b/pkgs/by-name/ca/cargo-lambda/package.nix
index ec87d7a95376..6d6bc5a3b780 100644
--- a/pkgs/by-name/ca/cargo-lambda/package.nix
+++ b/pkgs/by-name/ca/cargo-lambda/package.nix
@@ -51,7 +51,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     wrapProgram $out/bin/cargo-lambda --prefix PATH : ${lib.makeBinPath [ zig_0_13 ]}
   '';
 
-  CARGO_LAMBDA_BUILD_INFO = "(nixpkgs)";
+  env.CARGO_LAMBDA_BUILD_INFO = "(nixpkgs)";
 
   cargoBuildFlags = [ "--features=skip-build-banner" ];
   cargoCheckFlags = [ "--features=skip-build-banner" ];
diff --git a/pkgs/by-name/ca/cargo-zigbuild/package.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix
index 15feed1151b8..7d83121ca99d 100644
--- a/pkgs/by-name/ca/cargo-zigbuild/package.nix
+++ b/pkgs/by-name/ca/cargo-zigbuild/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-zigbuild";
-  version = "0.21.6";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "messense";
     repo = "cargo-zigbuild";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZoZM43439Pph4slCyLe8D0KcZzO9F3Mb3wAT3xK9jBg=";
+    hash = "sha256-vW5SDi4oIJ2ScAdpZhLmP5RY9C1fN38XsBauaNrx9Nw=";
   };
 
-  cargoHash = "sha256-X7cOyn0ZZHUtRqaGOZqLh4Y61Q3u9PLA31GkN3zu/VM=";
+  cargoHash = "sha256-DLg91rS+fjo7QhmQr1NaZE+vpVVxs+5euPqM1QySDlE=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/by-name/cc/ccemux/package.nix b/pkgs/by-name/cc/ccemux/package.nix
index 9337a0ecec56..de4ab522b583 100644
--- a/pkgs/by-name/cc/ccemux/package.nix
+++ b/pkgs/by-name/cc/ccemux/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     cp -r ${desktopItem}/share/applications $out/share/applications
 
     install -D ${finalAttrs.src} $out/share/ccemux/ccemux.jar
-    install -D ${desktopIcon} $out/share/pixmaps/ccemux.png
+    install -D ${desktopIcon} $out/share/icons/hicolor/256x256/apps/ccemux.png
 
     makeWrapper ${jre}/bin/java $out/bin/ccemux \
       --add-flags "-jar $out/share/ccemux/ccemux.jar"
diff --git a/pkgs/by-name/cc/ccextractor/package.nix b/pkgs/by-name/cc/ccextractor/package.nix
index ce4f958b0803..0db6e5fc7165 100644
--- a/pkgs/by-name/cc/ccextractor/package.nix
+++ b/pkgs/by-name/cc/ccextractor/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   writeTextFile,
 
   pkg-config,
@@ -43,6 +44,11 @@ stdenv.mkDerivation (finalAttrs: {
     ./remove-default-commit-hash.patch
     ./remove-vendored-libraries.patch
     ./fix-avcodec-close.patch
+    (fetchpatch {
+      name = "CVE-2026-2245.patch";
+      url = "https://github.com/CCExtractor/ccextractor/commit/fd7271bae238ccb3ae8a71304ea64f0886324925.patch";
+      hash = "sha256-wZiJob5v4SVa5YBmiHuNvgphSi4PhTTb3hg4vs1lhVg=";
+    })
   ]
   ++ finalAttrs.cargoDeps.vendorStaging.patches;
 
diff --git a/pkgs/by-name/ce/celestegame/celeste.nix b/pkgs/by-name/ce/celestegame/celeste.nix
index 7158be54b3a6..351fb2b042f9 100644
--- a/pkgs/by-name/ce/celestegame/celeste.nix
+++ b/pkgs/by-name/ce/celestegame/celeste.nix
@@ -57,6 +57,7 @@ stdenvNoCC.mkDerivation {
 
   src =
     if overrideSrc == null then
+      # TODO: Replace this with fetchItchIo
       requireFile {
         name = "celeste-linux.zip";
         hash = "sha256-phNDBBHb7zwMRaBHT5D0hFEilkx9F31p6IllvLhHQb8=";
diff --git a/pkgs/by-name/ch/chatmcp/package.nix b/pkgs/by-name/ch/chatmcp/package.nix
index 31c4db7ccf7e..4fa6fcaa8305 100644
--- a/pkgs/by-name/ch/chatmcp/package.nix
+++ b/pkgs/by-name/ch/chatmcp/package.nix
@@ -40,7 +40,7 @@ flutter332.buildFlutterApplication rec {
   ];
 
   postInstall = ''
-    install -Dm0644 assets/logo.png $out/share/pixmaps/chatmcp.png
+    install -Dm0644 assets/logo.png $out/share/icons/hicolor/1024x1024/apps/chatmcp.png
   '';
 
   passthru = {
diff --git a/pkgs/by-name/ch/check-jsonschema/package.nix b/pkgs/by-name/ch/check-jsonschema/package.nix
index 22371f92e945..896bde54aadd 100644
--- a/pkgs/by-name/ch/check-jsonschema/package.nix
+++ b/pkgs/by-name/ch/check-jsonschema/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "check-jsonschema";
-  version = "0.36.1";
+  version = "0.36.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-jsonschema";
     repo = "check-jsonschema";
     tag = finalAttrs.version;
-    hash = "sha256-s8a/9kWKSu+WuHQyoBsK4Vn30c+EA/eld/OD3kHYvbk=";
+    hash = "sha256-Cml1pqy8H8mCCE7qte3JS80RZFdNrI6m+Ktd4QgnrF4=";
   };
 
   build-system = with python3Packages; [ setuptools ];
diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix
index db726a700ba4..17e876d9c427 100644
--- a/pkgs/by-name/ch/cherry-studio/package.nix
+++ b/pkgs/by-name/ch/cherry-studio/package.nix
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
       else
         "cp -r dist/linux-unpacked/{resources,LICENSE*} $out/opt/cherry-studio"
     }
-    install -Dm644 build/icon.png $out/share/pixmaps/cherry-studio.png
+    install -Dm644 build/icon.png $out/share/icons/hicolor/1024x1024/apps/cherry-studio.png
     makeWrapper ${lib.getExe electron} $out/bin/cherry-studio \
       --inherit-argv0 \
       --add-flags $out/opt/cherry-studio/resources/app.asar \
diff --git a/pkgs/by-name/ch/chromium-bsu/package.nix b/pkgs/by-name/ch/chromium-bsu/package.nix
index c7ccee6ad7f0..3bfed040f706 100644
--- a/pkgs/by-name/ch/chromium-bsu/package.nix
+++ b/pkgs/by-name/ch/chromium-bsu/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postInstall = ''
-    install -D misc/chromium-bsu.png $out/share/pixmaps/chromium-bsu.png
+    install -D misc/chromium-bsu.png -t $out/share/icons/hicolor/64x64/apps
     install -D misc/chromium-bsu.desktop $out/share/applications/chromium-bsu.desktop
   '';
 
diff --git a/pkgs/by-name/cl/clapgrep/package.nix b/pkgs/by-name/cl/clapgrep/package.nix
index 874d0995ca62..f64e4e7df6e0 100644
--- a/pkgs/by-name/cl/clapgrep/package.nix
+++ b/pkgs/by-name/cl/clapgrep/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "clapgrep";
-  version = "25.10";
+  version = "26.02";
 
   src = fetchFromGitHub {
     owner = "luleyleo";
     repo = "clapgrep";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Y7XwS4jOj8WHi3ntLwPne86/ZVkdBaWrDtPmUcUG4XE=";
+    hash = "sha256-8OG3yVfmvAJN/e07r/2rij0tairE/hOdERDwqDt8fbk=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
diff --git a/pkgs/by-name/co/cocoon/package.nix b/pkgs/by-name/co/cocoon/package.nix
index dc819eba7a26..f679c83c5e4b 100644
--- a/pkgs/by-name/co/cocoon/package.nix
+++ b/pkgs/by-name/co/cocoon/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "cocoon";
-  version = "0.8.4";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "haileyok";
     repo = "cocoon";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xXXHJcI3icsCeOeI+6L/waK3+UtjhBZosQPLoGN1TiY=";
+    hash = "sha256-2+K4KiF0N+Y+J5dS4xQZuYlxr6OYzNloVXjxyGnEHh4=";
   };
 
   ldflags = [
diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json
index 52f0853f5154..1dd1459bd012 100644
--- a/pkgs/by-name/co/code-cursor/sources.json
+++ b/pkgs/by-name/co/code-cursor/sources.json
@@ -1,22 +1,22 @@
 {
-  "version": "2.4.31",
+  "version": "2.5.17",
   "vscodeVersion": "1.105.1",
   "sources": {
     "x86_64-linux": {
-      "url": "https://downloads.cursor.com/production/3578107fdf149b00059ddad37048220e4168100f/linux/x64/Cursor-2.4.31-x86_64.AppImage",
-      "hash": "sha256-4cEa5SsbE2QFfmcndnVI5QQIS9DPjFQ6u/iQO9P8SEk="
+      "url": "https://downloads.cursor.com/production/7b98dcb824ea96c9c62362a5e80dbf0d1aae4775/linux/x64/Cursor-2.5.17-x86_64.AppImage",
+      "hash": "sha256-tUVqfxkUUMXGFzI2lGgoIDuQxI9LSrspDuz4xPGpQig="
     },
     "aarch64-linux": {
-      "url": "https://downloads.cursor.com/production/3578107fdf149b00059ddad37048220e4168100f/linux/arm64/Cursor-2.4.31-aarch64.AppImage",
-      "hash": "sha256-b66KmFN92HZRyZnlFVMxCCgX0bWBktfKojtnXF7c+Qg="
+      "url": "https://downloads.cursor.com/production/7b98dcb824ea96c9c62362a5e80dbf0d1aae4775/linux/arm64/Cursor-2.5.17-aarch64.AppImage",
+      "hash": "sha256-yXr/sNyhsGbO1Coj7jI/LyRtyNfRuzOlaLuMAXNAI7g="
     },
     "x86_64-darwin": {
-      "url": "https://downloads.cursor.com/production/3578107fdf149b00059ddad37048220e4168100f/darwin/x64/Cursor-darwin-x64.dmg",
-      "hash": "sha256-JQq73IqSAlkedhCuxr+uIpWPEAslnMPxciDDQYHWU6o="
+      "url": "https://downloads.cursor.com/production/7b98dcb824ea96c9c62362a5e80dbf0d1aae4775/darwin/x64/Cursor-darwin-x64.dmg",
+      "hash": "sha256-w738cXHYcckDtnOYYcuL3xxUH/rAcHS/nQG78npJ6IQ="
     },
     "aarch64-darwin": {
-      "url": "https://downloads.cursor.com/production/3578107fdf149b00059ddad37048220e4168100f/darwin/arm64/Cursor-darwin-arm64.dmg",
-      "hash": "sha256-xXzWWDfU00IDx3vqnB0A4mItSyvfRqasUhqOAj8U5aE="
+      "url": "https://downloads.cursor.com/production/7b98dcb824ea96c9c62362a5e80dbf0d1aae4775/darwin/arm64/Cursor-darwin-arm64.dmg",
+      "hash": "sha256-zHQJb/FNV2jLMrtDzMSMVs09+FvZj1ndSWB7HnB9lsU="
     }
   }
 }
diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix
index f918d785faf0..3da924bec58e 100644
--- a/pkgs/by-name/co/codebook/package.nix
+++ b/pkgs/by-name/co/codebook/package.nix
@@ -20,8 +20,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildAndTestSubdir = "crates/codebook-lsp";
   cargoHash = "sha256-hxPgYGBq+KZfEyFiHQG31cNEN6A6hUgKRgZXIHOGalw=";
 
-  CARGO_PROFILE_RELEASE_LTO = "fat";
-  CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
+  env = {
+    CARGO_PROFILE_RELEASE_LTO = "fat";
+    CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
+  };
 
   # Integration tests require internet access for dictionaries
   doCheck = false;
diff --git a/pkgs/by-name/co/color-lsp/package.nix b/pkgs/by-name/co/color-lsp/package.nix
index 1607772ee192..1aae44dc65ec 100644
--- a/pkgs/by-name/co/color-lsp/package.nix
+++ b/pkgs/by-name/co/color-lsp/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "color-lsp";
-  version = "0.2.2";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "huacnlee";
     repo = "color-lsp";
     rev = "v${version}";
-    hash = "sha256-U0pTzW2PCgMxVsa1QX9MC249PXXL2KvRSN1Em2WvIeI=";
+    hash = "sha256-p58rAVznBzhBv7gVvaEjMpCrk9kFuEjUvY6U4uMXUE8=";
   };
 
-  cargoHash = "sha256-etK+9fcKS+y+0C36vJrMkQ0yyVSpCW/DLKg4nTw3LrE=";
+  cargoHash = "sha256-o/me2LIv6qvxOuHUnyv8+GcfoJlmdFymJkJMuOlC1Nw=";
 
   # Only build the color-lsp binary, not the zed extension
   cargoBuildFlags = [
diff --git a/pkgs/by-name/co/copywrite/package.nix b/pkgs/by-name/co/copywrite/package.nix
index 5cf5c474a26d..507068a1ac1e 100644
--- a/pkgs/by-name/co/copywrite/package.nix
+++ b/pkgs/by-name/co/copywrite/package.nix
@@ -9,21 +9,21 @@
 }:
 
 let
-  commitHash = "d5bc935e4801a02fdbd953f8f0ae7989eaef50cf"; # matches tag release
+  commitHash = "be318748da098346a52133c0f7d4a4104a56efc5"; # matches tag release
   shortCommitHash = builtins.substring 0 7 commitHash;
 in
 buildGoModule (finalAttrs: {
   pname = "copywrite";
-  version = "0.22.0";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "copywrite";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gPVlHgFlLxoAj4pkg3OxD4CGQaLdAL312/Zn/pJ+7fg=";
+    hash = "sha256-gw5i50fHshyRrSU3/M4HWM/J82HawGXPHHg9nKIRBkQ=";
   };
 
-  vendorHash = "sha256-Qxp6BwN/Y6Xb1BwFGT/T8WYsXGPgN27mzoTE0i6cS1Q=";
+  vendorHash = "sha256-607qlAhrk+1SdrIeE9eYBW3qJKq9i7hEzObvKH66Dfk=";
 
   ldflags = [
     "-s"
@@ -34,6 +34,10 @@ buildGoModule (finalAttrs: {
 
   env.CGO_ENABLED = 0;
 
+  checkFlags = [
+    "-skip=Test_FormatCopyrightYears_AutoDetect" # depends on git metadata
+  ];
+
   nativeBuildInputs = [ installShellFiles ];
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     $out/bin/copywrite completion bash > copywrite.bash
diff --git a/pkgs/servers/dcnnt/default.nix b/pkgs/by-name/dc/dcnnt/package.nix
similarity index 78%
rename from pkgs/servers/dcnnt/default.nix
rename to pkgs/by-name/dc/dcnnt/package.nix
index 6f82a28ff33a..94b8eb16446f 100644
--- a/pkgs/servers/dcnnt/default.nix
+++ b/pkgs/by-name/dc/dcnnt/package.nix
@@ -1,21 +1,20 @@
 {
-  buildPythonApplication,
-  fetchPypi,
   lib,
-  pycryptodome,
+  python3Packages,
+  fetchPypi,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "dcnnt";
   version = "0.10.0";
   format = "setuptools";
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-73ZLgb5YcXlAOjbKLVv8oqgS6pstBdJxa7LFUgIHpUE=";
   };
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3Packages; [
     pycryptodome
   ];
 
@@ -30,4 +29,4 @@ buildPythonApplication rec {
     maintainers = with lib.maintainers; [ arnoutkroeze ];
     mainProgram = "dcnnt";
   };
-}
+})
diff --git a/pkgs/by-name/dd/ddm/package.nix b/pkgs/by-name/dd/ddm/package.nix
index c5884aa7779b..32c513861972 100644
--- a/pkgs/by-name/dd/ddm/package.nix
+++ b/pkgs/by-name/dd/ddm/package.nix
@@ -1,7 +1,7 @@
 {
   stdenvNoCC,
   lib,
-  requireFile,
+  fetchItchIo,
   asar,
   copyDesktopItems,
   electron,
@@ -18,10 +18,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "ddm";
   version = "4.1.0";
 
-  src = requireFile {
+  src = fetchItchIo {
     name = "DungeonDuelMonsters-linux-x64.zip";
     hash = "sha256-gq2nGwpaStqaVI1pL63xygxOI/z53o+zLwiKizG98Ks=";
-    url = "https://mikaygo.itch.io/ddm";
+    gameUrl = "https://mikaygo.itch.io/ddm";
+    upload = "13371354";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/de/decent-sampler/package.nix b/pkgs/by-name/de/decent-sampler/package.nix
index 49400c93d453..3e64e464b76f 100644
--- a/pkgs/by-name/de/decent-sampler/package.nix
+++ b/pkgs/by-name/de/decent-sampler/package.nix
@@ -7,6 +7,7 @@
   copyDesktopItems,
   buildFHSEnv,
   alsa-lib,
+  alsa-plugins,
   freetype,
   nghttp2,
   libx11,
@@ -15,7 +16,7 @@
 
 let
   pname = "decent-sampler";
-  version = "1.15.0";
+  version = "1.15.5";
   rlkey = "orvjprslmwn0dkfs0ncx6nxnm";
 
   icon = fetchurl {
@@ -28,8 +29,8 @@ let
 
     src = fetchzip {
       # dropbox links: https://www.dropbox.com/sh/dwyry6xpy5uut07/AABBJ84bjTTSQWzXGG5TOQpfa\
-      url = "https://www.dropbox.com/scl/fo/a0i0udw7ggfwnjoi05hh3/ABn4zZmR24tyJx0xaRS_lXg/Decent_Sampler-${version}-Linux-Static-x86_64.tar.gz?rlkey=${rlkey}&dl=0";
-      hash = "sha256-A+CBsGUtqXo7KAlx6BjbHGRZww73TlJCI68thicGKiE=";
+      url = "https://www.dropbox.com/scl/fo/a0i0udw7ggfwnjoi05hh3/ADKHnE9GsrZx5RepuBKy7dg/Decent_Sampler-${version}-Linux-Static-x86_64.tar.gz?rlkey=${rlkey}&dl=0";
+      hash = "sha256-uUEncrT0M4AmIokizrUdSATm8Dnvg3cBNGlH8wOPt+Y=";
     };
 
     nativeBuildInputs = [ copyDesktopItems ];
@@ -68,6 +69,7 @@ buildFHSEnv {
 
   targetPkgs = pkgs: [
     alsa-lib
+    alsa-plugins
     decent-sampler
     freetype
     nghttp2
diff --git a/pkgs/by-name/di/discordo/package.nix b/pkgs/by-name/di/discordo/package.nix
index d152977a0444..82f752c089fa 100644
--- a/pkgs/by-name/di/discordo/package.nix
+++ b/pkgs/by-name/di/discordo/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "discordo";
-  version = "0-unstable-2026-02-09";
+  version = "0-unstable-2026-02-17";
 
   src = fetchFromGitHub {
     owner = "ayn2op";
     repo = "discordo";
-    rev = "4c61e7c67a78d0906ffa77794deeb45e53d659d2";
-    hash = "sha256-3UHQJDi+9TW7yD2yWfD+1hr8iSvyd1HLGqbtk0iYlVg=";
+    rev = "f1650a0df751e40a589ceda4ec19626e109bac2b";
+    hash = "sha256-+1XK5Zri7DiKzaqsFHYjzde1XEFlp4cj878+FzLaibg=";
   };
 
-  vendorHash = "sha256-8Le/d6sXXH0dCORWLOFUjHlbGcKr0yqQ2l8GQzLaYt0=";
+  vendorHash = "sha256-eltE7RkxqjYMWMv8/YmCC+WlntBTF8zO7UE0MQsG8Is=";
 
   env.CGO_ENABLED = 1;
 
diff --git a/pkgs/by-name/dm/dms-shell/package.nix b/pkgs/by-name/dm/dms-shell/package.nix
index 63122d0d9aaa..6fbef771c73d 100644
--- a/pkgs/by-name/dm/dms-shell/package.nix
+++ b/pkgs/by-name/dm/dms-shell/package.nix
@@ -28,13 +28,13 @@ buildGoModule (
   in
   {
     pname = "dms-shell";
-    version = "1.4.0";
+    version = "1.4.1";
 
     src = fetchFromGitHub {
       owner = "AvengeMedia";
       repo = "DankMaterialShell";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-O9NIJqfuSjwY//7OyFH3FqxRHe5M0vmmsXcryOi/bAE=";
+      hash = "sha256-abNemkJQxp8E9bCNyTlAcFxKx+t1Wsc49J5NRZuyCgs=";
     };
 
     sourceRoot = "${finalAttrs.src.name}/core";
diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix
index cd571f791097..cbfff0b01c04 100644
--- a/pkgs/by-name/do/dolt/package.nix
+++ b/pkgs/by-name/do/dolt/package.nix
@@ -26,6 +26,6 @@ buildGoModule (finalAttrs: {
     mainProgram = "dolt";
     homepage = "https://github.com/dolthub/dolt";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ danbst ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/dy/dynarmic/0001-CMakeLists-update-mcl-version-to-0.1.13.patch b/pkgs/by-name/dy/dynarmic/0001-CMakeLists-update-mcl-version-to-0.1.13.patch
deleted file mode 100644
index 8f28e58bff85..000000000000
--- a/pkgs/by-name/dy/dynarmic/0001-CMakeLists-update-mcl-version-to-0.1.13.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From cdbf3ba41ddce41d8ae375464e514f72d158ec0b Mon Sep 17 00:00:00 2001
-From: Marcin Serwin <marcin@serwin.dev>
-Date: Sat, 5 Jul 2025 22:26:49 +0200
-Subject: [PATCH] CMakeLists: update mcl version to 0.1.13
-
-The mcl in externals is already at this version, but it wasn't bumped
-here which makes it impossible to use prebuilt mcl.
-
-Signed-off-by: Marcin Serwin <marcin@serwin.dev>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e95050da..edd153d0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -145,7 +145,7 @@ set(TSL_ROBIN_MAP_ENABLE_INSTALL ON)
- 
- find_package(Boost 1.57 REQUIRED)
- find_package(fmt 9 CONFIG)
--find_package(mcl 0.1.12 EXACT CONFIG)
-+find_package(mcl 0.1.13 EXACT CONFIG)
- find_package(tsl-robin-map CONFIG)
- 
- if ("arm64" IN_LIST ARCHITECTURE OR DYNARMIC_TESTS)
--- 
-2.49.0
-
diff --git a/pkgs/by-name/dy/dynarmic/package.nix b/pkgs/by-name/dy/dynarmic/package.nix
index 800e38b15588..5e927b4ae056 100644
--- a/pkgs/by-name/dy/dynarmic/package.nix
+++ b/pkgs/by-name/dy/dynarmic/package.nix
@@ -13,69 +13,21 @@
   nix-update-script,
   azahar,
   darwin,
+  oaknut,
+  mcl-cpp-utility-lib,
 }:
-let
-  oaknut = stdenv.mkDerivation {
-    pname = "oaknut";
-    version = "1.2.2-unstable-2024-03-01";
-
-    src = fetchFromGitHub {
-      owner = "merryhime";
-      repo = "oaknut";
-      rev = "94c726ce0338b054eb8cb5ea91de8fe6c19f4392";
-      hash = "sha256-IhP/110NGN42/FvpGIEm9MgsSiPYdtD8kNxL0cAWbqM=";
-    };
-
-    nativeBuildInputs = [
-      cmake
-      ninja
-    ];
-  };
-
-  mcl = stdenv.mkDerivation {
-    pname = "mcl";
-    version = "0.1.13-unstable-2025-03-16";
-
-    src = fetchFromGitHub {
-      owner = "azahar-emu";
-      repo = "mcl";
-      rev = "7b08d83418f628b800dfac1c9a16c3f59036fbad";
-      hash = "sha256-uTOiOlMzKbZSjKjtVSqFU+9m8v8horoCq3wL0O2E8sI=";
-    };
-
-    nativeBuildInputs = [
-      cmake
-      ninja
-    ];
-
-    buildInputs = [
-      fmt
-    ];
-
-    checkInputs = [
-      catch2_3
-    ];
-
-    doCheck = true;
-    checkPhase = ''
-      tests/mcl-tests
-    '';
-  };
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "dynarmic";
-  version = "6.7.0-unstable-2025-03-16";
+  version = "6.7.0-unstable-2026-01-04";
 
   src = fetchFromGitHub {
     owner = "azahar-emu";
     repo = "dynarmic";
-    rev = "278405bd71999ed3f3c77c5f78344a06fef798b9";
-    hash = "sha256-D7nXn5y0h8FV0V8Tc8uBlRoeEU+gcpt44afujZvG+1A=";
+    rev = "526227eebe1efff3fb14dbf494b9c5b44c2e9c1f";
+    hash = "sha256-WG9mUFUnhEEF0+qsQzslTAj1nox3jaz6rVKs245EtV4=";
   };
 
   patches = [
-    # https://github.com/azahar-emu/dynarmic/pull/2
-    ./0001-CMakeLists-update-mcl-version-to-0.1.13.patch
     # https://github.com/azahar-emu/dynarmic/pull/3
     ./0001-xbyak-Fix-tests-when-using-newer-versions.patch
   ];
@@ -94,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     boost
     robin-map
-    mcl
+    mcl-cpp-utility-lib
     fmt
   ]
   ++ lib.optionals stdenv.hostPlatform.isAarch64 [
@@ -123,8 +75,6 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = true;
 
   passthru = {
-    inherit mcl oaknut;
-
     updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
     tests = { inherit azahar; };
   };
diff --git a/pkgs/by-name/ec/ecc/package.nix b/pkgs/by-name/ec/ecc/package.nix
index 5ad96e6cd549..aee4052f8132 100644
--- a/pkgs/by-name/ec/ecc/package.nix
+++ b/pkgs/by-name/ec/ecc/package.nix
@@ -78,7 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     zlib
   ];
 
-  CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER = "gcc";
+  env.CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER = "gcc";
 
   preBuild = ''
     # `SANDBOX` defined by upstream to disable build-time network access
diff --git a/pkgs/by-name/ed/eden/aarch64-disable-fastmem.patch b/pkgs/by-name/ed/eden/aarch64-disable-fastmem.patch
new file mode 100644
index 000000000000..de9a50a070c9
--- /dev/null
+++ b/pkgs/by-name/ed/eden/aarch64-disable-fastmem.patch
@@ -0,0 +1,13 @@
+diff --git a/src/common/settings.cpp b/src/common/settings.cpp
+index 2c88356888..96198006b7 100644
+--- a/src/common/settings.cpp
++++ b/src/common/settings.cpp
+@@ -176,7 +176,7 @@ bool IsFastmemEnabled() {
+     if (values.cpu_accuracy.GetValue() == CpuAccuracy::Unsafe) {
+         return bool(values.cpuopt_unsafe_host_mmu);
+     }
+-#if !defined(__APPLE__) && !defined(__linux__) && !defined(__ANDROID__) && !defined(_WIN32)
++#if !defined(__APPLE__) && !defined(__linux__) && !defined(__ANDROID__) && !defined(_WIN32) || (defined(__linux__) && defined(__aarch64__))
+     return false;
+ #else
+     return true;
diff --git a/pkgs/by-name/ed/eden/package.nix b/pkgs/by-name/ed/eden/package.nix
new file mode 100644
index 000000000000..03a9d3ed524e
--- /dev/null
+++ b/pkgs/by-name/ed/eden/package.nix
@@ -0,0 +1,254 @@
+{
+  lib,
+  stdenv,
+  cmake,
+  ninja,
+  SDL2,
+  boost,
+  catch2_3,
+  cpp-jwt,
+  cubeb,
+  enet,
+  fetchFromGitea,
+  fetchurl,
+  ffmpeg-headless,
+  fmt,
+  frozen-containers,
+  gamemode,
+  glslang,
+  httplib,
+  kdePackages,
+  libopus,
+  libusb1,
+  lz4,
+  mcl-cpp-utility-lib,
+  mbedtls,
+  nix-update-script,
+  nlohmann_json,
+  oaknut,
+  openssl,
+  pipewire,
+  pkg-config,
+  python3,
+  qt6,
+  simpleini,
+  sirit,
+  spirv-headers,
+  spirv-tools,
+  stb,
+  unordered_dense,
+  vulkan-headers,
+  vulkan-loader,
+  vulkan-memory-allocator,
+  vulkan-utility-libraries,
+  xbyak,
+  zlib,
+  zstd,
+  tzdata,
+}:
+
+let
+  # Old yuzu compat list, the project does not publish its own at the moment
+  compat-list = fetchurl {
+    url = "https://raw.githubusercontent.com/flathub/org.yuzu_emu.yuzu/4abf1d239aba843180abfed58fa8541432fece5b/compatibility_list.json";
+    hash = "sha256-OC22KdawYK9yKiffqc1rtgrBanVExYMi9jqhvkwMD6w=";
+  };
+
+  nx_tzdb = stdenv.mkDerivation (finalAttrs: {
+    name = "tzdb_to_nx";
+    version = "120226";
+
+    src = fetchFromGitea {
+      domain = "git.crueter.xyz";
+      owner = "misc";
+      repo = "tzdb_to_nx";
+      tag = finalAttrs.version;
+      hash = "sha256-egPu8UVbj73RQ0Z5JMTjd5HVdy47WTfkUMlQaS0wUTg=";
+    };
+
+    nativeBuildInputs = [
+      cmake
+      ninja
+    ];
+
+    cmakeFlags = [
+      (lib.cmakeFeature "TZDB2NX_ZONEINFO_DIR" "${tzdata}/share/zoneinfo")
+      (lib.cmakeFeature "TZDB2NX_VERSION" tzdata.version)
+    ];
+
+    ninjaFlags = [ "x80e" ];
+
+    installPhase = ''
+      runHook preInstall
+
+      cp -r src/tzdb/nx $out
+
+      runHook postInstall
+    '';
+  });
+in
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "eden";
+  version = "0.1.1";
+
+  src = fetchFromGitea {
+    domain = "git.eden-emu.dev";
+    owner = "eden-emu";
+    repo = "eden";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-tkro7ZHgn2809Utf/Li5+OiseywyQKH15eqphxlJZQQ=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    glslang
+    pkg-config
+    python3
+    qt6.qttools
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    boost
+    cpp-jwt
+    cubeb
+    enet
+    ffmpeg-headless
+    fmt
+    frozen-containers
+    gamemode
+    httplib
+    kdePackages.quazip
+    libopus
+    libusb1
+    # intentionally omitted: LLVM - heavy, only used for stack traces in the debugger
+    lz4
+    mcl-cpp-utility-lib
+    nlohmann_json
+    openssl
+    qt6.qtbase
+    qt6.qtmultimedia
+    qt6.qtwayland
+    qt6.qtwebengine
+    # intentionally omitted: renderdoc - heavy, developer only
+    SDL2
+    stb
+    simpleini
+    spirv-tools
+    spirv-headers
+    vulkan-headers
+    vulkan-memory-allocator
+    vulkan-utility-libraries
+    mbedtls
+    sirit
+    unordered_dense
+    zlib
+    zstd
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+    xbyak
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    oaknut
+  ];
+
+  patches = [
+    # https://git.eden-emu.dev/eden-emu/eden/issues/3484
+    ./aarch64-disable-fastmem.patch
+  ];
+
+  doCheck = true;
+
+  checkInputs = [
+    catch2_3
+    oaknut
+  ];
+
+  __structuredAttrs = true;
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
+    (lib.cmakeBool "YUZU_TESTS" false) # some timer tests are flaky
+
+    # use system libraries
+    (lib.cmakeBool "CPMUTIL_FORCE_SYSTEM" true)
+    (lib.cmakeBool "YUZU_USE_EXTERNAL_SDL2" false)
+    (lib.cmakeBool "YUZU_USE_BUNDLED_FFMPEG" false)
+    (lib.cmakeFeature "YUZU_TZDB_PATH" "${nx_tzdb}")
+
+    # enable some optional features
+    (lib.cmakeBool "YUZU_USE_QT_WEB_ENGINE" true)
+    (lib.cmakeBool "YUZU_USE_QT_MULTIMEDIA" true)
+    (lib.cmakeBool "ENABLE_QT_TRANSLATION" true)
+
+    # We dont want to bother upstream with potentially outdated compat reports
+    (lib.cmakeBool "YUZU_ENABLE_COMPATIBILITY_REPORTING" false)
+
+    (lib.cmakeFeature "TITLE_BAR_FORMAT_IDLE" "${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) {}")
+    (lib.cmakeFeature "TITLE_BAR_FORMAT_RUNNING" "${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) | {}")
+  ];
+
+  postConfigure = ''
+    ln -sf ${compat-list} ./dist/compatibility_list/compatibility_list.json
+  '';
+
+  postInstall = ''
+    install -Dm444 $src/dist/72-yuzu-input.rules $out/lib/udev/rules.d/72-yuzu-input.rules
+  '';
+
+  preFixup = ''
+    qtWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${
+      lib.makeLibraryPath [
+        vulkan-loader
+        pipewire
+      ]
+    })
+  '';
+
+  passthru = {
+    inherit nx_tzdb compat-list;
+
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Switch 1 emulator derived from Yuzu and Sudachi";
+    homepage = "https://eden-emu.dev/";
+    mainProgram = "eden";
+    maintainers = with lib.maintainers; [ marcin-serwin ];
+    license = with lib.licenses; [
+      # Primary
+      gpl3Plus
+
+      # Build system
+      lgpl3Plus
+
+      # Dynarmic and Yuzu code
+      gpl2Plus
+      bsd0
+
+      # Icons
+      cc-by-40
+      cc-by-sa-30
+      cc0
+
+      # Timezone data
+      publicDomain
+
+      # Vendored/incorporated libs
+      apsl20
+      llvm-exception
+      lib.licenses.boost
+      bsd2
+      bsd3
+      mit
+      mpl20
+      wtfpl
+    ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+  };
+})
diff --git a/pkgs/by-name/en/entire/package.nix b/pkgs/by-name/en/entire/package.nix
index fc16fa0e2833..d4788d2bf6f0 100644
--- a/pkgs/by-name/en/entire/package.nix
+++ b/pkgs/by-name/en/entire/package.nix
@@ -5,6 +5,7 @@
   installShellFiles,
   git,
   stdenv,
+  writableTmpDirAsHomeHook,
 }:
 
 buildGoModule (finalAttrs: {
@@ -29,11 +30,16 @@ buildGoModule (finalAttrs: {
   ldflags = [
     "-s"
     "-w"
+    "-X=github.com/entireio/cli/cmd/entire/cli/buildinfo.Version=${finalAttrs.version}"
+    "-X=github.com/entireio/cli/cmd/entire/cli/buildinfo.Commit=${finalAttrs.src.rev}"
   ];
 
   nativeBuildInputs = [ installShellFiles ];
 
-  nativeCheckInputs = [ git ];
+  nativeCheckInputs = [
+    git
+    writableTmpDirAsHomeHook
+  ];
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd entire \
@@ -50,9 +56,12 @@ buildGoModule (finalAttrs: {
       of how code was written in your repo.
     '';
     homepage = "https://github.com/entireio/cli";
-    changelog = "https://github.com/entireio/cli/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/entireio/cli/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ sheeeng ];
+    maintainers = with lib.maintainers; [
+      sheeeng
+      squishykid
+    ];
     mainProgram = "entire";
   };
 })
diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix
index 7a63cd3e0d92..ebb8d6cd55e1 100644
--- a/pkgs/by-name/ex/exo/package.nix
+++ b/pkgs/by-name/ex/exo/package.nix
@@ -75,7 +75,7 @@ let
         sourceRoot
         ;
       fetcherVersion = 2;
-      hash = "sha256-3ZgE1ysb1OeB4BNszvlrnYcc7gOo7coPfOEQmMHC6E0=";
+      hash = "sha256-ok1Yl8CIPwViioH5HOM4VWilRU3HsSa8IAsBFl/QgG0=";
     };
   });
 
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/dev-shell.nix b/pkgs/by-name/fl/flatten-references-graph/dev-shell.nix
similarity index 95%
rename from pkgs/by-name/fl/flattenReferencesGraph/dev-shell.nix
rename to pkgs/by-name/fl/flatten-references-graph/dev-shell.nix
index fd04d00424a3..43f64192ea7b 100644
--- a/pkgs/by-name/fl/flattenReferencesGraph/dev-shell.nix
+++ b/pkgs/by-name/fl/flatten-references-graph/dev-shell.nix
@@ -1,5 +1,5 @@
 # Start this shell with:
-# nix-shell path/to/root/of/nixpkgs -A flattenReferencesGraph.dev-shell
+# nix-shell path/to/root/of/nixpkgs -A flatten-references-graph.dev-shell
 {
   mkShell,
   callPackage,
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/helpers.nix b/pkgs/by-name/fl/flatten-references-graph/helpers.nix
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/helpers.nix
rename to pkgs/by-name/fl/flatten-references-graph/helpers.nix
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/package.nix b/pkgs/by-name/fl/flatten-references-graph/package.nix
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/package.nix
rename to pkgs/by-name/fl/flatten-references-graph/package.nix
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/.flake8 b/pkgs/by-name/fl/flatten-references-graph/src/.flake8
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/.flake8
rename to pkgs/by-name/fl/flatten-references-graph/src/.flake8
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/.gitignore b/pkgs/by-name/fl/flatten-references-graph/src/.gitignore
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/.gitignore
rename to pkgs/by-name/fl/flatten-references-graph/src/.gitignore
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/__init__.py b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/__init__.py
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/__init__.py
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/__init__.py
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/__main__.py b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/__main__.py
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/__main__.py
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/__main__.py
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/__main___test.py b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/__main___test.py
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/__main___test.py
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/__main___test.py
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/__test_fixtures/fake-references-graph.json b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/__test_fixtures/fake-references-graph.json
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/__test_fixtures/fake-references-graph.json
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/__test_fixtures/fake-references-graph.json
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/__test_fixtures/flatten-references-graph-main-input-no-paths.json b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/__test_fixtures/flatten-references-graph-main-input-no-paths.json
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/__test_fixtures/flatten-references-graph-main-input-no-paths.json
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/__test_fixtures/flatten-references-graph-main-input-no-paths.json
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/__test_fixtures/flatten-references-graph-main-input.json b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/__test_fixtures/flatten-references-graph-main-input.json
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/__test_fixtures/flatten-references-graph-main-input.json
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/__test_fixtures/flatten-references-graph-main-input.json
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/flatten_references_graph.py b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/flatten_references_graph.py
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/flatten_references_graph.py
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/flatten_references_graph.py
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/flatten_references_graph_test.py b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/flatten_references_graph_test.py
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/flatten_references_graph_test.py
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/flatten_references_graph_test.py
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/lib.py b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/lib.py
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/lib.py
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/lib.py
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/lib_test.py b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/lib_test.py
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/lib_test.py
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/lib_test.py
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/pipe.py b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/pipe.py
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/pipe.py
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/pipe.py
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/pipe_test.py b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/pipe_test.py
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/pipe_test.py
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/pipe_test.py
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/popularity_contest.py b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/popularity_contest.py
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/popularity_contest.py
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/popularity_contest.py
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/popularity_contest_test.py b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/popularity_contest_test.py
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/popularity_contest_test.py
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/popularity_contest_test.py
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/split_paths.py b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/split_paths.py
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/split_paths.py
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/split_paths.py
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/split_paths_test.py b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/split_paths_test.py
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/split_paths_test.py
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/split_paths_test.py
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/subcomponent.py b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/subcomponent.py
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/subcomponent.py
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/subcomponent.py
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/subcomponent_test.py b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/subcomponent_test.py
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/subcomponent_test.py
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/subcomponent_test.py
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/test_helpers.py b/pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/test_helpers.py
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/flatten_references_graph/test_helpers.py
rename to pkgs/by-name/fl/flatten-references-graph/src/flatten_references_graph/test_helpers.py
diff --git a/pkgs/by-name/fl/flattenReferencesGraph/src/setup.py b/pkgs/by-name/fl/flatten-references-graph/src/setup.py
similarity index 100%
rename from pkgs/by-name/fl/flattenReferencesGraph/src/setup.py
rename to pkgs/by-name/fl/flatten-references-graph/src/setup.py
diff --git a/pkgs/by-name/fr/friture/package.nix b/pkgs/by-name/fr/friture/package.nix
index 262851c626b9..b2defd58301a 100644
--- a/pkgs/by-name/fr/friture/package.nix
+++ b/pkgs/by-name/fr/friture/package.nix
@@ -18,8 +18,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
   };
 
   postPatch = ''
-    sed -i -e 's/==.*"/"/' -e '/packages=\[/a "friture.playback",' pyproject.toml
-    sed -i -e 's/tostring/tobytes/' friture/spectrogram_image.py
+    substituteInPlace pyproject.toml \
+      --replace-fail "numpy==2.3.2" "numpy" \
+      --replace-fail "Cython==3.1.3" "Cython"
   '';
 
   nativeBuildInputs =
@@ -31,6 +32,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
     ])
     ++ (with qt5; [ wrapQtAppsHook ]);
 
+  # Very strict versions
+  pythonRelaxDeps = true;
+
+  # Not actually used, dropped from nixpkgs
+  pythonRemoveDeps = [ "pyrr" ];
+
   buildInputs = with qt5; [ qtquickcontrols2 ];
 
   propagatedBuildInputs = with python3Packages; [
@@ -43,7 +50,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     numpy
     pyqt5
     appdirs
-    pyrr
     rtmixer
   ];
 
@@ -52,7 +58,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   '';
 
   postInstall = ''
-    substituteInPlace $out/share/applications/friture.desktop --replace usr/bin/friture friture
+    substituteInPlace $out/share/applications/friture.desktop --replace-fail usr/bin/friture friture
 
     for size in 16 32 128 256 512
     do
diff --git a/pkgs/by-name/fr/frotz/0001-Fix-SDL_SOUND_CFLAGS-usage.patch b/pkgs/by-name/fr/frotz/0001-Fix-SDL_SOUND_CFLAGS-usage.patch
new file mode 100644
index 000000000000..6e17ee19ab13
--- /dev/null
+++ b/pkgs/by-name/fr/frotz/0001-Fix-SDL_SOUND_CFLAGS-usage.patch
@@ -0,0 +1,38 @@
+From 8b1db0c6724640ff995c24145a9777bd49da1ce4 Mon Sep 17 00:00:00 2001
+From: Marcin Serwin <marcin@serwin.dev>
+Date: Fri, 21 Nov 2025 19:11:48 +0100
+Subject: [PATCH] Fix SDL_SOUND_CFLAGS usage
+
+The flags were quried but unused during compilation. Also, there was a
+typo in the else branch.
+
+Signed-off-by: Marcin Serwin <marcin@serwin.dev>
+---
+ src/sdl/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/sdl/Makefile b/src/sdl/Makefile
+index e21477e..84a2136 100644
+--- a/src/sdl/Makefile
++++ b/src/sdl/Makefile
+@@ -22,7 +22,7 @@ SDL_CFLAGS += $(shell $(PKGCONF) $(SDL_PKGS) --cflags)
+ SDL_SOUND_CFLAGS += $(shell $(PKGCONF) $(SDL_SOUND_PKGS) --cflags)
+ else
+ SDL_CFLAGS += $(SDL_CFLAGS_DEF)
+-SD_SOUND_CFLAGS += $(SDL_SOUND_CFLAGS_DEF)
++SDL_SOUND_CFLAGS += $(SDL_SOUND_CFLAGS_DEF)
+ endif
+ 
+ 
+@@ -32,7 +32,7 @@ $(TARGET): $(DEFINES) $(OBJECTS) | $(DEFINES)
+ 	@echo "** Done with SDL interface."
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) $(SDL_CFLAGS) -fPIC -fpic -o $@ -c $<
++	$(CC) $(CFLAGS) $(SDL_CFLAGS) $(SDL_SOUND_CFLAGS) -fPIC -fpic -o $@ -c $<
+ 
+ $(DEFINES):
+ 	@echo "** Generating $@"
+-- 
+2.51.2
+
diff --git a/pkgs/by-name/fr/frotz/package.nix b/pkgs/by-name/fr/frotz/package.nix
index 75d60c2eaa82..20f823d9c128 100644
--- a/pkgs/by-name/fr/frotz/package.nix
+++ b/pkgs/by-name/fr/frotz/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  fetchpatch,
   libao,
   libmodplug,
   libsamplerate,
@@ -11,28 +10,42 @@
   ncurses,
   which,
   pkg-config,
+  SDL2,
+  SDL2_mixer,
+  zlib,
+  libjpeg,
+  libpng,
+  freetype,
+  frontend ? "ncurses",
 }:
 
+assert lib.assertOneOf "frontend" frontend [
+  "ncurses"
+  "sdl"
+  # NOTE: more options are present in the Makefile, e.g., x11, dumb, nosound, ...
+];
+let
+  progName = if frontend == "ncurses" then "frotz" else "sfrotz";
+in
 stdenv.mkDerivation (finalAttrs: {
-  pname = "frotz";
-  version = "2.54";
+  pname = progName;
+  version = "2.55";
 
   src = fetchFromGitLab {
     domain = "gitlab.com";
     owner = "DavidGriffith";
     repo = "frotz";
-    rev = finalAttrs.version;
-    hash = "sha256-GvGxojD8d5GVy/d8h3q6K7KJroz2lsKbfE0F0acjBl8=";
+    tag = finalAttrs.version;
+    hash = "sha256-XZjimskjupTtYdgfVaOS2QnQrDIBSwkJqxrffdjgZk0=";
   };
 
   patches = [
-    (fetchpatch {
-      url = "https://github.com/macports/macports-ports/raw/496e5b91e3b6c9dc6820d77ab60dbe400d1924ee/games/frotz/files/Makefile.patch";
-      extraPrefix = "";
-      hash = "sha256-P83ZzSi3bhncQ52Y38Q3F/7v1SJKr5614tytt862HRg=";
-    })
+    # https://gitlab.com/DavidGriffith/frotz/-/merge_requests/226
+    ./0001-Fix-SDL_SOUND_CFLAGS-usage.patch
   ];
 
+  strictDeps = true;
+  enableParallelBuilding = true;
   nativeBuildInputs = [
     which
     pkg-config
@@ -43,16 +56,37 @@ stdenv.mkDerivation (finalAttrs: {
     libsamplerate
     libsndfile
     libvorbis
-    ncurses
-  ];
+  ]
+  ++ (
+    if frontend == "ncurses" then
+      [ ncurses ]
+    else
+      [
+        freetype
+        libjpeg
+        libpng
+        SDL2
+        SDL2_mixer
+        zlib
+      ]
+  );
 
-  installFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "HOMEBREW_PREFIX=/var/empty"
+  ];
+  preConfigure = ''
+    makeFlagsArray+=(CURSES_CONFIG="$PKG_CONFIG ncurses")
+  '';
+
+  buildFlags = [ frontend ];
+  installTargets = if frontend == "ncurses" then "install-frotz" else "install-${frontend}";
 
   meta = {
     homepage = "https://davidgriffith.gitlab.io/frotz/";
     changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${finalAttrs.version}/NEWS";
-    description = "Z-machine interpreter for Infocom games and other interactive fiction";
-    mainProgram = "frotz";
+    description = "Z-machine interpreter for Infocom games and other interactive fiction (${frontend})";
+    mainProgram = progName;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       nicknovitski
diff --git a/pkgs/by-name/fu/fusionInventory/package.nix b/pkgs/by-name/fu/fusioninventory-agent/package.nix
similarity index 98%
rename from pkgs/by-name/fu/fusionInventory/package.nix
rename to pkgs/by-name/fu/fusioninventory-agent/package.nix
index 96a454ec3953..57c6ffc5d652 100644
--- a/pkgs/by-name/fu/fusionInventory/package.nix
+++ b/pkgs/by-name/fu/fusioninventory-agent/package.nix
@@ -12,7 +12,7 @@
 }:
 
 perlPackages.buildPerlPackage rec {
-  pname = "FusionInventory-Agent";
+  pname = "fusioninventory-agent";
   version = "2.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/gh/ghmap/package.nix b/pkgs/by-name/gh/ghmap/package.nix
index 42f0ee327e95..4b60a24e41c3 100644
--- a/pkgs/by-name/gh/ghmap/package.nix
+++ b/pkgs/by-name/gh/ghmap/package.nix
@@ -1,42 +1 @@
-{
-  lib,
-  python3Packages,
-  fetchFromGitHub,
-}:
-
-python3Packages.buildPythonApplication (finalAttrs: {
-  pname = "ghmap";
-  version = "2.0.3";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "uhourri";
-    repo = "ghmap";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-UF7Zxrm+thZeAKPiCaI5t4NbDzuUU3oosPsb0Cgv9t0=";
-  };
-
-  build-system = with python3Packages; [
-    setuptools
-  ];
-
-  dependencies = with python3Packages; [
-    tqdm
-  ];
-
-  pythonImportsCheck = [
-    "ghmap"
-  ];
-
-  nativeCheckInputs = with python3Packages; [
-    pytestCheckHook
-  ];
-
-  meta = {
-    description = "Python tool for mapping GitHub events to contributor activities";
-    homepage = "https://github.com/uhourri/ghmap";
-    license = lib.licenses.mit;
-    maintainers = [ ];
-    mainProgram = "ghmap";
-  };
-})
+{ python3Packages }: python3Packages.toPythonApplication python3Packages.ghmap
diff --git a/pkgs/by-name/gi/git/osxkeychain-link-rust_lib.patch b/pkgs/by-name/gi/git/osxkeychain-link-rust_lib.patch
new file mode 100644
index 000000000000..a0015f87888d
--- /dev/null
+++ b/pkgs/by-name/gi/git/osxkeychain-link-rust_lib.patch
@@ -0,0 +1,15 @@
+diff -ur a/Makefile b/Makefile
+--- a/Makefile	2026-02-14 15:58:16.624434564 -0500
++++ b/Makefile	2026-02-14 15:59:25.701016105 -0500
+@@ -4059,9 +4059,9 @@
+ contrib/libgit-sys/libgitpub.a: $(LIBGIT_HIDDEN_EXPORT)
+ 	$(AR) $(ARFLAGS) $@ $^
+ 
+-contrib/credential/osxkeychain/git-credential-osxkeychain: contrib/credential/osxkeychain/git-credential-osxkeychain.o $(LIB_FILE) GIT-LDFLAGS
++contrib/credential/osxkeychain/git-credential-osxkeychain: contrib/credential/osxkeychain/git-credential-osxkeychain.o $(LIB_FILE) $(RUST_LIB) GIT-LDFLAGS
+ 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \
+-		$(filter %.o,$^) $(LIB_FILE) $(EXTLIBS) -framework Security -framework CoreFoundation
++		$(filter %.o,$^) $(LIB_FILE) $(RUST_LIB) $(EXTLIBS) -framework Security -framework CoreFoundation
+ 
+ contrib/credential/osxkeychain/git-credential-osxkeychain.o: contrib/credential/osxkeychain/git-credential-osxkeychain.c GIT-CFLAGS
+ 	$(QUIET_LINK)$(CC) -o $@ -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
diff --git a/pkgs/by-name/gi/git/package.nix b/pkgs/by-name/gi/git/package.nix
index 81163b08c273..0706590fe968 100644
--- a/pkgs/by-name/gi/git/package.nix
+++ b/pkgs/by-name/gi/git/package.nix
@@ -61,7 +61,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.52.0";
+  version = "2.53.0";
   svn = subversionClient.override { perlBindings = perlSupport; };
   gitwebPerlLibs = with perlPackages; [
     CGI
@@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
         }.tar.xz"
       else
         "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    hash = "sha256-PNj+6G9pqUnLYQ/ujNkmTmhz0H+lhBH2Bgs9YnKe18U=";
+    hash = "sha256-WBi9fYCwYbu9/sikM9YJ3IgYoFmR9zH/xKVh4soYxlM=";
   };
 
   outputs = [ "out" ] ++ lib.optional withManual "doc";
@@ -130,13 +130,20 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://lore.kernel.org/git/20251201031040.1120091-1-brianmlyles@gmail.com/raw";
       hash = "sha256-vvhbvg74OIMzfksHiErSnjOZ+W0M/T9J8GOQ4E4wKbU=";
     })
-    # Fixes t8020 test on big-endian
+  ]
+  ++ lib.optionals osxkeychainSupport [
+    # Fix build failure on Darwin when building Keychain integration
+    # See https://github.com/git/git/pull/2188 and https://github.com/Homebrew/homebrew-core/pull/266961
     (fetchurl {
-      name = "last-modified-fix-bug-caused-by-inproper-initialized-memory.patch";
-      url = "https://lore.kernel.org/git/20251128-toon-big-endian-ci-v1-1-80da0f629c1e@iotcl.com/raw";
-      hash = "sha256-WdewOwD7hMhnahhUUEYAlM58tT3MkxUlBa3n8IwrESU=";
+      name = "osxkeychain-define-build-targets-in-toplevel-Makefile.patch";
+      url = "https://lore.kernel.org/git/pull.2046.v2.git.1770775169908.gitgitgadget@gmail.com/raw";
+      hash = "sha256-7jTiMM5XFRDj/srtVf8olW62T/mesqLcyRp3NZJcid8=";
     })
   ]
+  ++ lib.optionals (rustSupport && osxkeychainSupport) [
+    # The above patch doesn’t work with Rust support enabled.
+    ./osxkeychain-link-rust_lib.patch
+  ]
   ++ lib.optionals withSsh [
     # Hard-code the ssh executable to ${pkgs.openssh}/bin/ssh instead of
     # searching in $PATH
@@ -277,7 +284,7 @@ stdenv.mkDerivation (finalAttrs: {
     make -C contrib/diff-highlight "''${flagsArray[@]}"
   ''
   + lib.optionalString osxkeychainSupport ''
-    make -C contrib/credential/osxkeychain "''${flagsArray[@]}"
+    make -C contrib/credential/osxkeychain COMPUTE_HEADER_DEPENDENCIES=no "''${flagsArray[@]}"
   ''
   + lib.optionalString withLibsecret ''
     make -C contrib/credential/libsecret "''${flagsArray[@]}"
diff --git a/pkgs/by-name/gn/gnmic/package.nix b/pkgs/by-name/gn/gnmic/package.nix
index 35d46ab521b5..796405687779 100644
--- a/pkgs/by-name/gn/gnmic/package.nix
+++ b/pkgs/by-name/gn/gnmic/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gnmic";
-  version = "0.43.0";
+  version = "0.44.0";
 
   src = fetchFromGitHub {
     owner = "openconfig";
     repo = "gnmic";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+5f4SxAmpZrOmIr8MUR3ImmoPbzFQ0bh/4qnqkpfs1g=";
+    hash = "sha256-gIKhJ8BaJq/IXXOJrY+n8BoAxKxDDXvEc3JDXGcOxW0=";
   };
 
-  vendorHash = "sha256-zsb+Tky2yVyEUSKjvnS8YkRFMUf/01VIX2Vl6mB5mpw=";
+  vendorHash = "sha256-osVsIqluU4la2oDWGbjDQq0sM9uCiWgsar5H/XNudV0=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/gn/gnutls/package.nix b/pkgs/by-name/gn/gnutls/package.nix
index cb61a8d837b0..f47370729a2e 100644
--- a/pkgs/by-name/gn/gnutls/package.nix
+++ b/pkgs/by-name/gn/gnutls/package.nix
@@ -62,11 +62,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gnutls";
-  version = "3.8.11";
+  version = "3.8.12";
 
   src = fetchurl {
     url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz";
-    hash = "sha256-kb0jxKhuvGFS6BMD0gz2zq65e8j4QmbQ+uxuKfF7qiA=";
+    hash = "sha256-p7NBQhv9RZrPejdMpK87ngZgjc1715Kyv0cL6gErjlE=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/go/go-musicfox/package.nix b/pkgs/by-name/go/go-musicfox/package.nix
index 2e0c1fd65b2e..892d4050fb78 100644
--- a/pkgs/by-name/go/go-musicfox/package.nix
+++ b/pkgs/by-name/go/go-musicfox/package.nix
@@ -11,18 +11,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-musicfox";
-  version = "4.7.2";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "go-musicfox";
     repo = "go-musicfox";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-RJPb+aZawU22HBXTfr7+TP0ocFsNrP1mOHvHPRm2RnA=";
+    hash = "sha256-9OQTwyEGuHOMM5LgL6Y5zVavNnQhzJSZZu4ABhr0rds=";
   };
 
   deleteVendor = true;
 
-  vendorHash = "sha256-KQp22eF48jhhCSZA/1weWVavyP3be4j4mOPM5EPssGs=";
+  vendorHash = "sha256-MEcdWJts7hzt8fuhVsxHl1mQ57R8vNd3H3Tmpx4A9a4=";
 
   subPackages = [ "cmd/musicfox.go" ];
 
diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 038223219dc8..bbc405d2b785 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -184,11 +184,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "145.0.7632.75";
+    version = "145.0.7632.109";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-4hFjRhkURRq1NXdAUPesS32t/NyG9eb784/sW75DlCU=";
+      hash = "sha256-VNvx/3l3gzj8HjeeK3v/Hj05E9t2PvsiP8pnIOq1AEA=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -302,11 +302,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "145.0.7632.76";
+    version = "145.0.7632.110";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/n6e44i3vvn55x7sajqc7tgrlx4_145.0.7632.76/GoogleChrome-145.0.7632.76.dmg";
-      hash = "sha256-auSCvJ0r3OyXjDICmgFAeD/MFveOmEZD3fnuryI5ozU=";
+      url = "http://dl.google.com/release2/chrome/odn6jvyow6owsodlm42m33k7ta_145.0.7632.110/GoogleChrome-145.0.7632.110.dmg";
+      hash = "sha256-siBn+vaSvvgrMEF1Da74nu1WGvyM1QUggarrEuqcGy4=";
     };
 
     dontPatch = true;
diff --git a/pkgs/by-name/go/goredo/package.nix b/pkgs/by-name/go/goredo/package.nix
index 81f5eb303931..cd4bdde31003 100644
--- a/pkgs/by-name/go/goredo/package.nix
+++ b/pkgs/by-name/go/goredo/package.nix
@@ -24,12 +24,14 @@ buildGoModule (finalAttrs: {
 
   nativeBuildInputs = [ zstd ];
 
-  nativeCheckInputs = lib.optionals finalAttrs.doCheck [
+  nativeCheckInputs = lib.optionals finalAttrs.finalPackage.doCheck [
     python3
     perl
   ];
 
-  inherit (sharness) SHARNESS_TEST_SRCDIR;
+  env = {
+    inherit (sharness) SHARNESS_TEST_SRCDIR;
+  };
 
   vendorHash = null;
 
diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix
index bd2e4f118fc6..4f720d19ee72 100644
--- a/pkgs/by-name/gr/grafana-loki/package.nix
+++ b/pkgs/by-name/gr/grafana-loki/package.nix
@@ -12,14 +12,14 @@
 }:
 
 buildGoModule (finalAttrs: {
-  version = "3.6.5";
+  version = "3.6.6";
   pname = "grafana-loki";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "loki";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-f9YijC8MH+vPxh6N/LKQIhsSWM6uEqIyHY+5J3mu+aQ=";
+    hash = "sha256-Mdopa7Nhdcwn4VBz/R5zI3Zccuht2hIdnAeCsAS6B+0=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/he/heisenbridge/package.nix b/pkgs/by-name/he/heisenbridge/package.nix
index 625ff384a2c5..e4193a0eaad1 100644
--- a/pkgs/by-name/he/heisenbridge/package.nix
+++ b/pkgs/by-name/he/heisenbridge/package.nix
@@ -27,6 +27,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
 
   pythonRelaxDeps = [
     "irc"
+    "ruamel.yaml"
+    "mautrix"
   ];
 
   dependencies = with python3.pkgs; [
diff --git a/pkgs/by-name/hy/hyprviz/package.nix b/pkgs/by-name/hy/hyprviz/package.nix
index 34f1e8375be3..f1afb113073d 100644
--- a/pkgs/by-name/hy/hyprviz/package.nix
+++ b/pkgs/by-name/hy/hyprviz/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hyprviz";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "timasoft";
     repo = "hyprviz";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ar1O/Em9AcPPfbuT4xnyOwBX1IClJlFYfdPQbU/5vTk=";
+    hash = "sha256-5w7+fkf2oB0x5N6xlKjSPbgsB7Ifr1NWW8qWDmGyFwU=";
   };
 
-  cargoHash = "sha256-BICF6nZcn/7t5X4Dj18fPD2RpEz7U1Zytt9sfHe7Xnw=";
+  cargoHash = "sha256-+8MKYruPjCTooiY7pxwz5oqIpk4ZidugPrVlMZ1yMI0=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix
index 92bf2b833aab..d56a22565a18 100644
--- a/pkgs/by-name/im/immich-machine-learning/package.nix
+++ b/pkgs/by-name/im/immich-machine-learning/package.nix
@@ -17,6 +17,7 @@ python.pkgs.buildPythonApplication rec {
   pyproject = true;
 
   pythonRelaxDeps = [
+    "huggingface-hub"
     "numpy"
     "pillow"
     "pydantic-settings"
diff --git a/pkgs/by-name/in/incus-ui-canonical/package.nix b/pkgs/by-name/in/incus-ui-canonical/package.nix
index 56cffab8eb33..7928a8510c45 100644
--- a/pkgs/by-name/in/incus-ui-canonical/package.nix
+++ b/pkgs/by-name/in/incus-ui-canonical/package.nix
@@ -20,14 +20,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "incus-ui-canonical";
-  version = "0.19.4";
+  version = "0.19.5";
 
   src = fetchFromGitHub {
     owner = "zabbly";
     repo = "incus-ui-canonical";
     # only use tags prefixed by incus- they are the tested fork versions
     tag = "incus-${finalAttrs.version}";
-    hash = "sha256-B/05tQbiqpi5gzoHjFVTS7CHwuO2xSHHSu76/fNjRug=";
+    hash = "sha256-dwQshNQrP/3AWsFtDeMpUIm3l3Oqjj1jkKw98KT4u9M=";
   };
 
   offlineCache = fetchYarnDeps {
diff --git a/pkgs/by-name/in/inetutils/package.nix b/pkgs/by-name/in/inetutils/package.nix
index 2a24e641e991..8b3d074e30fc 100644
--- a/pkgs/by-name/in/inetutils/package.nix
+++ b/pkgs/by-name/in/inetutils/package.nix
@@ -10,13 +10,12 @@
   libxcrypt,
   util-linux,
 }:
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "inetutils";
   version = "2.7";
 
   src = fetchurl {
-    url = "mirror://gnu/inetutils/inetutils-${version}.tar.gz";
+    url = "mirror://gnu/inetutils/inetutils-${finalAttrs.version}.tar.gz";
     hash = "sha256-oVa+HN48XA/+/CYhgNk2mmBIQIeQeqVUxieH0vQOwIY=";
   };
 
@@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
     # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3
     ./inetutils-1_9-PATH_PROCNET_DEV.patch
 
-    ./tests-libls.sh.patch
+    (if stdenv.isDarwin then ./tests-libls-2.sh.patch else ./tests-libls.sh.patch)
 
     (fetchpatch {
       name = "CVE-2026-24061_1.patch";
@@ -78,6 +77,8 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-servers";
 
+  ${if stdenv.isDarwin then "hardeningDisable" else null} = [ "format" ];
+
   doCheck = true;
 
   installFlags = [ "SUIDMODE=" ];
@@ -124,4 +125,4 @@ stdenv.mkDerivation rec {
     */
     priority = (util-linux.meta.priority or lib.meta.defaultPriority) + 1;
   };
-}
+})
diff --git a/pkgs/by-name/in/inetutils/tests-libls-2.sh.patch b/pkgs/by-name/in/inetutils/tests-libls-2.sh.patch
new file mode 100644
index 000000000000..41c566811cac
--- /dev/null
+++ b/pkgs/by-name/in/inetutils/tests-libls-2.sh.patch
@@ -0,0 +1,18 @@
+tests: Remove bogus test for unsorted file listing and tests for -u and -c, which fail on apfs.
+
+Minimized from what Debian applies:
+https://git.hadrons.org/cgit/debian/pkgs/inetutils.git/tree/debian/patches/local/0006-tests-Remove-bogus-test-for-unsorted-file-listing.patch?id=8ab7f49fe5cf194e989ae6ae6a78eb65397c5778
+--- a/tests/libls.sh
++++ b/tests/libls.sh
+@@ -94 +93,0 @@ REPLY_C=`$LS -C $LSDIR`
+-REPLY_Cf=`$LS -Cf $LSDIR`
+@@ -108,2 +106,0 @@ REPLY_n=`$LS -n $LSDIR`
+-REPLY_Ccts=`$LS -Ccts $LSDIR`
+-REPLY_Cuts=`$LS -Cuts $LSDIR`
+@@ -133,2 +129,0 @@ test `echo "$diff" | $GREP -c -v '^[.]\{1,2\}$'` -eq 0 ||
+-test x"$REPLY_C" != x"$REPLY_Cf" ||
+-  { errno=1; echo >&2 'Failed to disable sorting with "-f".'; }
+@@ -153,3 +146,0 @@ test x"$REPLY_l" != x"$REPLY_n" ||
+-test x"$REPLY_Ccts" != x"$REPLY_Cuts" ||
+-  { errno=1; echo >&2 'Failed to distinguish "-u" from "-c".'; }
+-
diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix
index 4225e088e21c..ebf45d0c99b8 100644
--- a/pkgs/by-name/in/infrastructure-agent/package.nix
+++ b/pkgs/by-name/in/infrastructure-agent/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "infrastructure-agent";
-  version = "1.72.2";
+  version = "1.72.4";
 
   src = fetchFromGitHub {
     owner = "newrelic";
     repo = "infrastructure-agent";
     rev = finalAttrs.version;
-    hash = "sha256-GcQ/UUznuWdAtOyCC4qLQfItm81zwryV2gDDlYKFONI=";
+    hash = "sha256-qhw21kOspIyAyFQYXy56NhGCSesjkPrhagXfcfyiBRQ=";
   };
 
   vendorHash = "sha256-H41FxeJLrlaL/KbcBAS1WuMfVn6d+4So3egXb6E46/o=";
diff --git a/pkgs/by-name/in/intel2200BGFirmware/package.nix b/pkgs/by-name/ip/ipw2200-firmware/package.nix
similarity index 97%
rename from pkgs/by-name/in/intel2200BGFirmware/package.nix
rename to pkgs/by-name/ip/ipw2200-firmware/package.nix
index de67d222b3d0..08ef34705aec 100644
--- a/pkgs/by-name/in/intel2200BGFirmware/package.nix
+++ b/pkgs/by-name/ip/ipw2200-firmware/package.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenvNoCC.mkDerivation rec {
-  pname = "intel2200BGFirmware";
+  pname = "ipw2200-firmware";
   version = "3.1";
 
   src = fetchurl {
diff --git a/pkgs/by-name/ir/ircdHybrid/package.nix b/pkgs/by-name/ir/ircd-hybrid/package.nix
similarity index 100%
rename from pkgs/by-name/ir/ircdHybrid/package.nix
rename to pkgs/by-name/ir/ircd-hybrid/package.nix
diff --git a/pkgs/servers/isso/default.nix b/pkgs/by-name/is/isso/package.nix
similarity index 69%
rename from pkgs/servers/isso/default.nix
rename to pkgs/by-name/is/isso/package.nix
index e92390f8c982..2b1959ae6203 100644
--- a/pkgs/servers/isso/default.nix
+++ b/pkgs/by-name/is/isso/package.nix
@@ -1,16 +1,14 @@
 {
-  nodejs,
   lib,
   python3Packages,
   fetchFromGitHub,
   nixosTests,
   fetchNpmDeps,
+  nodejs_20,
   npmHooks,
 }:
 
-with python3Packages;
-
-buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "isso";
   version = "0.13.0";
   format = "setuptools";
@@ -18,12 +16,12 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "posativ";
     repo = "isso";
-    tag = version;
-    sha256 = "sha256-kZNf7Rlb1DZtQe4dK1B283OkzQQcCX+pbvZzfL65gsA=";
+    tag = finalAttrs.version;
+    hash = "sha256-kZNf7Rlb1DZtQe4dK1B283OkzQQcCX+pbvZzfL65gsA=";
   };
 
   npmDeps = fetchNpmDeps {
-    inherit src;
+    inherit (finalAttrs) src;
     hash = "sha256-RBpuhFI0hdi8bB48Pks9Ac/UdcQ/DJw+WFnNj5f7IYE=";
   };
 
@@ -38,7 +36,7 @@ buildPythonApplication rec {
       --replace "self.client.delete_cookie('localhost.local', '1')" "self.client.delete_cookie(key='1', domain='localhost')"
   '';
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3Packages; [
     itsdangerous
     jinja2
     misaka
@@ -49,25 +47,25 @@ buildPythonApplication rec {
   ];
 
   nativeBuildInputs = [
-    cffi
-    sphinxHook
-    sphinx
-    nodejs
+    python3Packages.cffi
+    python3Packages.sphinxHook
+    python3Packages.sphinx
+    nodejs_20
     npmHooks.npmConfigHook
   ];
 
   NODE_PATH = "$npmDeps";
 
   preBuild = ''
-    ln -s ${npmDeps}/node_modules ./node_modules
-    export PATH="${npmDeps}/bin:$PATH"
+    ln -s ${finalAttrs.npmDeps}/node_modules ./node_modules
+    export PATH="${finalAttrs.npmDeps}/bin:$PATH"
 
     make js
   '';
 
   nativeCheckInputs = [
-    pytestCheckHook
-    pytest-cov-stub
+    python3Packages.pytestCheckHook
+    python3Packages.pytest-cov-stub
   ];
 
   passthru.tests = { inherit (nixosTests) isso; };
@@ -79,4 +77,4 @@ buildPythonApplication rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fgaz ];
   };
-}
+})
diff --git a/pkgs/servers/jackett/deps.json b/pkgs/by-name/ja/jackett/deps.json
similarity index 100%
rename from pkgs/servers/jackett/deps.json
rename to pkgs/by-name/ja/jackett/deps.json
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/by-name/ja/jackett/package.nix
similarity index 82%
rename from pkgs/servers/jackett/default.nix
rename to pkgs/by-name/ja/jackett/package.nix
index 08e6b4f419e6..0f515a25017d 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/by-name/ja/jackett/package.nix
@@ -6,17 +6,18 @@
   dotnetCorePackages,
   openssl,
   mono,
+  nix-update-script,
   nixosTests,
 }:
 
-buildDotnetModule rec {
+buildDotnetModule (finalAttrs: {
   pname = "jackett";
   version = "0.24.1066";
 
   src = fetchFromGitHub {
     owner = "jackett";
     repo = "jackett";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-o0Mu5+m6+2iVRIJ8OIlUDNUY9h3qKn1hOsSA1JYd71o=";
   };
 
@@ -32,7 +33,7 @@ buildDotnetModule rec {
   ];
 
   postPatch = ''
-    substituteInPlace ${projectFile} ${testProjectFile} \
+    substituteInPlace ${finalAttrs.projectFile} ${finalAttrs.testProjectFile} \
       --replace-fail '<TargetFrameworks>net9.0;net471</' '<TargetFrameworks>net9.0</'
   '';
 
@@ -49,19 +50,21 @@ buildDotnetModule rec {
     ln -s $out/bin/jackett $out/bin/Jackett || :
     ln -s $out/bin/Jackett $out/bin/jackett || :
   '';
-  passthru.updateScript = ./updater.sh;
 
-  passthru.tests = { inherit (nixosTests) jackett; };
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = { inherit (nixosTests) jackett; };
+  };
 
   meta = {
     description = "API Support for your favorite torrent trackers";
     mainProgram = "jackett";
     homepage = "https://github.com/Jackett/Jackett/";
-    changelog = "https://github.com/Jackett/Jackett/releases/tag/v${version}";
+    changelog = "https://github.com/Jackett/Jackett/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       nyanloutre
       purcell
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ja/javaCup/javacup-0.11b_beta20160615-build-xml-git.patch b/pkgs/by-name/ja/java-cup/javacup-0.11b_beta20160615-build-xml-git.patch
similarity index 100%
rename from pkgs/by-name/ja/javaCup/javacup-0.11b_beta20160615-build-xml-git.patch
rename to pkgs/by-name/ja/java-cup/javacup-0.11b_beta20160615-build-xml-git.patch
diff --git a/pkgs/by-name/ja/javaCup/package.nix b/pkgs/by-name/ja/java-cup/package.nix
similarity index 100%
rename from pkgs/by-name/ja/javaCup/package.nix
rename to pkgs/by-name/ja/java-cup/package.nix
diff --git a/pkgs/by-name/ji/jing-trang/package.nix b/pkgs/by-name/ji/jing-trang/package.nix
index d7c72c56232d..8e03b7f8d8e1 100644
--- a/pkgs/by-name/ji/jing-trang/package.nix
+++ b/pkgs/by-name/ji/jing-trang/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     saxon
   ];
 
-  CLASSPATH = "lib/saxon.jar";
+  env.CLASSPATH = "lib/saxon.jar";
 
   patches = [
     ./no-git-during-build.patch
diff --git a/pkgs/by-name/jj/jj-pre-push/package.nix b/pkgs/by-name/jj/jj-pre-push/package.nix
index 9b5d9c11c3a7..375a201bbda3 100644
--- a/pkgs/by-name/jj/jj-pre-push/package.nix
+++ b/pkgs/by-name/jj/jj-pre-push/package.nix
@@ -21,6 +21,11 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-dZrZjzygT6Q7jIPkasYgJ2uN3eyPQXsg0opksookLYI=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "typer-slim" "typer"
+  '';
+
   build-system = [
     python3Packages.uv-build
   ];
@@ -28,7 +33,7 @@ python3Packages.buildPythonApplication rec {
   dependencies =
     with python3Packages;
     [
-      typer-slim
+      typer
     ]
     ++ lib.optionals withPrecommit [ pre-commit ];
 
diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix
index 520a847ecf23..6a16cc41066c 100644
--- a/pkgs/by-name/jj/jjui/package.nix
+++ b/pkgs/by-name/jj/jjui/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "jjui";
-  version = "0.9.11";
+  version = "0.9.12";
 
   src = fetchFromGitHub {
     owner = "idursun";
     repo = "jjui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WkUMDIzVW6n5Zp1r7rp1GgkcgswatmgNYdSpkmz5VWs=";
+    hash = "sha256-CBNMoVALCLWQ9bsrQilnx8djLufLNt8p9iK+HnpUPgc=";
   };
 
   vendorHash = "sha256-nXUaqkCz3QERqevwGk94sRrrPgJoJOPWXYc7iBOMAdY=";
diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix
index ae9d0c12eace..ccf2a7f25ce8 100644
--- a/pkgs/by-name/k6/k6/package.nix
+++ b/pkgs/by-name/k6/k6/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "k6";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "k6";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-rfurCWplI21vEYEArxp4wrAn6oOWenMkGetFDy5WCAY=";
+    hash = "sha256-pKkLrvqOz5d6iRCv3Ln31vhTBi0XWG1nSkIQ8xrK468=";
   };
 
   subPackages = [ "./" ];
diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix
index b76861d6e2bf..fec52abf278c 100644
--- a/pkgs/by-name/ki/kiro/package.nix
+++ b/pkgs/by-name/ki/kiro/package.nix
@@ -14,7 +14,7 @@ in
   inherit useVSCodeRipgrep;
   commandLineArgs = extraCommandLineArgs;
 
-  version = "0.9.2";
+  version = "0.9.47";
   pname = "kiro";
 
   # You can find the current VSCode version in the About dialog:
diff --git a/pkgs/by-name/ki/kiro/sources.json b/pkgs/by-name/ki/kiro/sources.json
index 67563b7be2e5..27ddca4b561c 100644
--- a/pkgs/by-name/ki/kiro/sources.json
+++ b/pkgs/by-name/ki/kiro/sources.json
@@ -1,14 +1,14 @@
 {
   "x86_64-linux": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.9.2/tar/kiro-ide-0.9.2-stable-linux-x64.tar.gz",
-    "hash": "sha256-/dMABkSiselaWuLQOnxB4dCt0VnLMzKn2LkKMLSG9MM="
+    "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.9.47/tar/kiro-ide-0.9.47-stable-linux-x64.tar.gz",
+    "hash": "sha256-30hUVXqudiwKAKQp8BtVBpjniGEMEH6CafPbjH5x+30="
   },
   "x86_64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.9.2/kiro-ide-0.9.2-stable-darwin-x64.dmg",
-    "hash": "sha256-3y2pmmjETqcTuQ85Nz/pK0m+UjjF+TzU+vhbuCsVzp8="
+    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.9.47/kiro-ide-0.9.47-stable-darwin-x64.dmg",
+    "hash": "sha256-K78V0LTO1HlQSW8+Ot0ysYvDm9O4wRghBw89MlpQbMg="
   },
   "aarch64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.9.2/kiro-ide-0.9.2-stable-darwin-arm64.dmg",
-    "hash": "sha256-YN8OT3w9ztMP+He53VBHVVA+0Yp8FBHZRpizEFQ84AU="
+    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.9.47/kiro-ide-0.9.47-stable-darwin-arm64.dmg",
+    "hash": "sha256-ovEsvLyfb8iI7hlrSyFjkJrzPxX5F/eltDcROKZfw2M="
   }
 }
diff --git a/pkgs/by-name/ko/koboredux/package.nix b/pkgs/by-name/ko/koboredux/package.nix
index e51cf8a042e9..84e97c1f5bdb 100644
--- a/pkgs/by-name/ko/koboredux/package.nix
+++ b/pkgs/by-name/ko/koboredux/package.nix
@@ -31,6 +31,7 @@ let
     sha256 = "09h9r65z8bar2z89s09j6px0gdq355kjf38rmd85xb2aqwnm6xig";
   };
 
+  # TODO: Replace this with fetchItchIo
   assets_src = requireFile {
     name = "koboredux-${version}-Linux.tar.bz2";
     sha256 = "11bmicx9i11m4c3dp19jsql0zy4rjf5a28x4hd2wl8h3bf8cdgav";
@@ -65,7 +66,14 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  postPatch = optionalString useProprietaryAssets ''
+  postPatch = ''
+    # CMake 4 support
+    # https://github.com/olofson/koboredux/pull/562
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 2.8)' \
+      'cmake_minimum_required(VERSION 2.8...4.1)'
+  ''
+  + optionalString useProprietaryAssets ''
     cp -r ../koboredux-${version}-Linux/sfx/redux data/sfx/
     cp -r ../koboredux-${version}-Linux/gfx/redux data/gfx/
     cp -r ../koboredux-${version}-Linux/gfx/redux_fullscreen data/gfx/
diff --git a/pkgs/by-name/ku/kubectl/package.nix b/pkgs/by-name/ku/kubectl/package.nix
index a4a76bc4b211..07a992ecdc6f 100644
--- a/pkgs/by-name/ku/kubectl/package.nix
+++ b/pkgs/by-name/ku/kubectl/package.nix
@@ -1,6 +1,13 @@
 { lib, kubernetes }:
-
-kubernetes.overrideAttrs (_: {
+let
+  kubernetes' = kubernetes.override {
+    components = [
+      "cmd/kubectl"
+      "cmd/kubectl-convert"
+    ];
+  };
+in
+kubernetes'.overrideAttrs (_: {
   pname = "kubectl";
 
   outputs = [
@@ -9,11 +16,6 @@ kubernetes.overrideAttrs (_: {
     "convert"
   ];
 
-  env.WHAT = toString [
-    "cmd/kubectl"
-    "cmd/kubectl-convert"
-  ];
-
   installPhase = ''
     runHook preInstall
     install -D _output/local/go/bin/kubectl -t $out/bin
diff --git a/pkgs/by-name/ku/kuttl/package.nix b/pkgs/by-name/ku/kuttl/package.nix
index 1ab982a7b184..40feb7b5ddb0 100644
--- a/pkgs/by-name/ku/kuttl/package.nix
+++ b/pkgs/by-name/ku/kuttl/package.nix
@@ -6,17 +6,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "kuttl";
-  version = "0.24.0";
+  version = "0.25.0";
   cli = "kubectl-kuttl";
 
   src = fetchFromGitHub {
     owner = "kudobuilder";
     repo = "kuttl";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Hkq1VukyImRLSQrOtH7IJyt2S8Zl+SNiWJfX4HpiOI4=";
+    sha256 = "sha256-ptF6T83PZY3avFnFeMdS6voZXRYVXFDxER03rNEX+s0=";
   };
 
-  vendorHash = "sha256-et/52c++8pgVgguCbPidVg0zFm9p7SVYI97N8sQ2KYQ=";
+  vendorHash = "sha256-UgFf+iKtJDeBxILCfshgqTU9ecALLyJwwOULsTKcjjk=";
 
   subPackages = [ "cmd/kubectl-kuttl" ];
 
diff --git a/pkgs/servers/osmocom/libasn1c/default.nix b/pkgs/by-name/li/libasn1c/package.nix
similarity index 85%
rename from pkgs/servers/osmocom/libasn1c/default.nix
rename to pkgs/by-name/li/libasn1c/package.nix
index 01eb7cf3bd45..941eacf4ea6d 100644
--- a/pkgs/servers/osmocom/libasn1c/default.nix
+++ b/pkgs/by-name/li/libasn1c/package.nix
@@ -7,19 +7,19 @@
   talloc,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libasn1c";
   version = "0.9.38";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "libasn1c";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-cnXcUvP6WwHVvpdsIVsMkizlLyg9KMwVj8XYX/nIfic=";
   };
 
   postPatch = ''
-    echo "${version}" > .tarball-version
+    echo "${finalAttrs.version}" > .tarball-version
   '';
 
   nativeBuildInputs = [
@@ -40,4 +40,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix
index 2c88c835c2fc..f393ee46823c 100644
--- a/pkgs/by-name/li/libcamera/package.nix
+++ b/pkgs/by-name/li/libcamera/package.nix
@@ -121,6 +121,10 @@ stdenv.mkDerivation rec {
     # Given that upstream also provides public documentation,
     # we can disable it here.
     "-Ddocumentation=disabled"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    # we don't have tensorflow-lite to build this
+    "-Drpi-awb-nn=disabled"
   ];
 
   # Fixes error on a deprecated declaration
diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index 001c7837ffb7..1398d86852e1 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libdeltachat";
-  version = "2.42.0";
+  version = "2.43.0";
 
   src = fetchFromGitHub {
     owner = "chatmail";
     repo = "core";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-67L3AxdaKzVjiBAc+3IHDzmOp93Phyt7jkDsyttZ3KY=";
+    hash = "sha256-3hpsc/IMBTVHH6Lun9R8Dx3s53sJOb9J1fU1O56MpIc=";
   };
 
   patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   cargoDeps = rustPlatform.fetchCargoVendor {
     pname = "chatmail-core";
     inherit (finalAttrs) version src;
-    hash = "sha256-mvPqIZ3zhwRNm6Z0Wk1gWlNMemIJP3JlzHgvfpEHtw4=";
+    hash = "sha256-kDYWu8QrVv1fAyNsPN5xY7QqExbdiM7C+Af0l9HVRDQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fa/fastJson/package.nix b/pkgs/by-name/li/libfastjson/package.nix
similarity index 95%
rename from pkgs/by-name/fa/fastJson/package.nix
rename to pkgs/by-name/li/libfastjson/package.nix
index 1f86fc65caab..be26d83e895f 100644
--- a/pkgs/by-name/fa/fastJson/package.nix
+++ b/pkgs/by-name/li/libfastjson/package.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "fastjson";
+  pname = "libfastjson";
   version = "1.2304.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/li/liblastfmSF/package.nix b/pkgs/by-name/li/liblastfm-vambrose/package.nix
similarity index 94%
rename from pkgs/by-name/li/liblastfmSF/package.nix
rename to pkgs/by-name/li/liblastfm-vambrose/package.nix
index 9a5cd7e77f63..5591abee5e4a 100644
--- a/pkgs/by-name/li/liblastfmSF/package.nix
+++ b/pkgs/by-name/li/liblastfm-vambrose/package.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "liblastfm-SF";
+  pname = "liblastfm-vambrose";
   version = "0.5";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/li/liblognorm/package.nix b/pkgs/by-name/li/liblognorm/package.nix
index 9240bdb87ea3..cd59051050d5 100644
--- a/pkgs/by-name/li/liblognorm/package.nix
+++ b/pkgs/by-name/li/liblognorm/package.nix
@@ -6,7 +6,7 @@
   libestr,
   json_c,
   pcre,
-  fastJson,
+  libfastjson,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     libestr
     json_c
     pcre
-    fastJson
+    libfastjson
   ];
 
   configureFlags = [ "--enable-regexp" ];
diff --git a/pkgs/by-name/li/libpng/package.nix b/pkgs/by-name/li/libpng/package.nix
index 9cc3aeb245fd..fbea8ca20d09 100644
--- a/pkgs/by-name/li/libpng/package.nix
+++ b/pkgs/by-name/li/libpng/package.nix
@@ -24,11 +24,15 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "libpng" + whenPatched "-apng";
-  version = "1.6.54";
+  version = if !stdenv.isDarwin then "1.6.55" else "1.6.54"; # FIXME: darwin lags temporarily
 
   src = fetchurl {
     url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz";
-    hash = "sha256-AcnYowPJQewsURwUMSo7HTbO20Hi9RaMzaqF1TuIeAU=";
+    hash =
+      if !stdenv.isDarwin then
+        "sha256-2SVyKGSDetWuKoIHDUsuBgPccq9EvUV8OWIpgli46C0="
+      else
+        "sha256-AcnYowPJQewsURwUMSo7HTbO20Hi9RaMzaqF1TuIeAU=";
   };
   postPatch =
     whenPatched "gunzip < ${patch_src} | patch -Np1"
diff --git a/pkgs/by-name/li/libstrophe/package.nix b/pkgs/by-name/li/libstrophe/package.nix
index a1d603f7485a..d6b75f366647 100644
--- a/pkgs/by-name/li/libstrophe/package.nix
+++ b/pkgs/by-name/li/libstrophe/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   autoreconfHook,
   libtool,
   openssl,
@@ -24,8 +25,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     # Newer GCC rejects implicitly weak-typed pointer casting.
-    # Upstream PR: https://github.com/strophe/libstrophe/pull/267
-    ./pointer-cast.patch
+    (fetchpatch2 {
+      name = "pointer-cast.patch";
+      url = "https://github.com/strophe/libstrophe/commit/dfb3e868248d86fc0f5553dffbb6f7c367c3c383.patch?full_index=1";
+      hash = "sha256-ALr2I53hGHW3OycKDdoXkNgANSYw1kUSYGqmAHkMq5E=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libstrophe/pointer-cast.patch b/pkgs/by-name/li/libstrophe/pointer-cast.patch
deleted file mode 100644
index b929636e021f..000000000000
--- a/pkgs/by-name/li/libstrophe/pointer-cast.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/src/handler.c b/src/handler.c
-index 1c9bf9f..168df75 100644
---- a/src/handler.c
-+++ b/src/handler.c
-@@ -320,7 +320,7 @@ static void _timed_handler_delete(xmpp_ctx_t *ctx,
-  */
- void xmpp_timed_handler_delete(xmpp_conn_t *conn, xmpp_timed_handler handler)
- {
--    _timed_handler_delete(conn->ctx, &conn->timed_handlers, handler);
-+    _timed_handler_delete(conn->ctx, &conn->timed_handlers, (xmpp_void_handler)handler);
- }
- 
- static void _id_handler_add(xmpp_conn_t *conn,
-@@ -349,7 +349,7 @@ static void _id_handler_add(xmpp_conn_t *conn,
-         return;
- 
-     item->user_handler = user_handler;
--    item->handler = handler;
-+    item->handler = (xmpp_void_handler)handler;
-     item->userdata = userdata;
-     item->enabled = 0;
-     item->next = NULL;
-@@ -451,7 +451,7 @@ static void _handler_add(xmpp_conn_t *conn,
- 
-     memset(item, 0, sizeof(*item));
-     item->user_handler = user_handler;
--    item->handler = handler;
-+    item->handler = (xmpp_void_handler)handler;
-     item->userdata = userdata;
- 
-     if (_dup_string(conn->ctx, ns, &item->u.ns))
-@@ -530,7 +530,7 @@ void xmpp_timed_handler_add(xmpp_conn_t *conn,
-                             unsigned long period,
-                             void *userdata)
- {
--    _timed_handler_add(conn->ctx, &conn->timed_handlers, handler, period,
-+    _timed_handler_add(conn->ctx, &conn->timed_handlers, (xmpp_void_handler)handler, period,
-                        userdata, 1);
- }
- 
-@@ -548,7 +548,7 @@ void handler_add_timed(xmpp_conn_t *conn,
-                        unsigned long period,
-                        void *userdata)
- {
--    _timed_handler_add(conn->ctx, &conn->timed_handlers, handler, period,
-+    _timed_handler_add(conn->ctx, &conn->timed_handlers, (xmpp_void_handler)handler, period,
-                        userdata, 0);
- }
- 
-@@ -747,7 +747,7 @@ void xmpp_global_timed_handler_add(xmpp_ctx_t *ctx,
-                                    unsigned long period,
-                                    void *userdata)
- {
--    _timed_handler_add(ctx, &ctx->timed_handlers, handler, period, userdata, 1);
-+    _timed_handler_add(ctx, &ctx->timed_handlers, (xmpp_void_handler)handler, period, userdata, 1);
- }
- 
- /** Delete a global timed handler.
-@@ -760,5 +760,5 @@ void xmpp_global_timed_handler_add(xmpp_ctx_t *ctx,
- void xmpp_global_timed_handler_delete(xmpp_ctx_t *ctx,
-                                       xmpp_global_timed_handler handler)
- {
--    _timed_handler_delete(ctx, &ctx->timed_handlers, handler);
-+    _timed_handler_delete(ctx, &ctx->timed_handlers, (xmpp_void_handler)handler);
- }
diff --git a/pkgs/by-name/li/lichess-bot/package.nix b/pkgs/by-name/li/lichess-bot/package.nix
index d6bad7aa9b34..0efd1d770106 100644
--- a/pkgs/by-name/li/lichess-bot/package.nix
+++ b/pkgs/by-name/li/lichess-bot/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "lichess-bot";
-  version = "2026.1.28.1";
+  version = "2026.2.13.1";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "lichess-bot-devs";
     repo = "lichess-bot";
-    rev = "6bc42182f959b83cda1e711fb752179807834e13";
-    hash = "sha256-kSNGOyL9vNDWOD80a3LOCf+DTWv2poS2EQ+xce8knTs=";
+    rev = "960bcad4ec5069547cc5fcfd496c47a70280ff56";
+    hash = "sha256-Dc6R9OufJCcTN32Hx2BVauTwaO9/gWRq24hJ4pWRObY=";
   };
 
   propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/by-name/li/lilypond-unstable/package.nix b/pkgs/by-name/li/lilypond-unstable/package.nix
new file mode 100644
index 000000000000..1fe01def478a
--- /dev/null
+++ b/pkgs/by-name/li/lilypond-unstable/package.nix
@@ -0,0 +1,25 @@
+{
+  lib,
+  fetchzip,
+  lilypond,
+  writeScript,
+}:
+
+lilypond.overrideAttrs (
+  finalAttrs: prevAttrs: {
+    version = "2.25.32";
+
+    src = fetchzip {
+      url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor finalAttrs.version}/lilypond-${finalAttrs.version}.tar.gz";
+      hash = "sha256-j7Avb9WSy27yQCak3KV7OB24M+T76b/tLcLoINLSEbo=";
+    };
+
+    passthru.updateScript = writeScript "update-lilypond-unstable" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts curl
+      version="$(curl -s 'https://gitlab.com/lilypond/lilypond/-/raw/master/VERSION' | grep 'VERSION_DEVEL=' | cut -d= -f2)"
+      update-source-version lilypond-unstable "$version" \
+         --file=pkgs/by-name/li/lilypond-unstable/package.nix
+    '';
+  }
+)
diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/by-name/li/lilypond-with-fonts/package.nix
similarity index 75%
rename from pkgs/misc/lilypond/with-fonts.nix
rename to pkgs/by-name/li/lilypond-with-fonts/package.nix
index 95bb75318e05..8c4f2c902a89 100644
--- a/pkgs/misc/lilypond/with-fonts.nix
+++ b/pkgs/by-name/li/lilypond-with-fonts/package.nix
@@ -14,7 +14,11 @@ lib.appendToName "with-fonts" (symlinkJoin {
     meta
     ;
 
-  paths = [ lilypond ] ++ openlilylib-fonts.all;
+  paths = [
+    lilypond
+  ]
+  # relevant for lilypond-unstable-with-fonts
+  ++ (openlilylib-fonts.override { inherit lilypond; }).all;
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/by-name/li/lilypond/package.nix
similarity index 84%
rename from pkgs/misc/lilypond/default.nix
rename to pkgs/by-name/li/lilypond/package.nix
index 9bd6351bd2b1..c81b8a6df53d 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/by-name/li/lilypond/package.nix
@@ -40,9 +40,10 @@
       metafont
     ]
   ),
+  writeScript,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lilypond";
   version = "2.24.4";
   outputs = [
@@ -51,7 +52,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchzip {
-    url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
+    url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor finalAttrs.version}/lilypond-${finalAttrs.version}.tar.gz";
     hash = "sha256-UYdORvodrVchxslOxpMiXrAh7DtB9sWp9yqZU/jeB9Y=";
   };
 
@@ -120,10 +121,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = {
-    command = [ ./update.sh ];
-    supportedFeatures = [ "commit" ];
-  };
+  passthru.updateScript = writeScript "update-lilypond" ''
+    #!/usr/bin/env nix-shell
+    #!nix-shell -i bash -p common-updater-scripts curl
+    version="$(curl -s 'https://gitlab.com/lilypond/lilypond/-/raw/master/VERSION' | grep 'VERSION_STABLE=' | cut -d= -f2)"
+    update-source-version lilypond "$version"
+  '';
 
   # documentation makefile uses "out" for different purposes, hence we explicitly set it to an empty string
   makeFlags = [ "out=" ];
@@ -147,4 +150,4 @@ stdenv.mkDerivation rec {
   FONTCONFIG_FILE = lib.optional stdenv.hostPlatform.isDarwin (makeFontsConf {
     fontDirectories = [ freefont_ttf ];
   });
-}
+})
diff --git a/pkgs/by-name/li/lintspec/package.nix b/pkgs/by-name/li/lintspec/package.nix
index a3c3aaa8b582..60cf0a1b0837 100644
--- a/pkgs/by-name/li/lintspec/package.nix
+++ b/pkgs/by-name/li/lintspec/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lintspec";
-  version = "0.13.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "beeb";
     repo = "lintspec";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XT4tj1FcdQpaL6N9H6Li/D9jrlJtHEZ1EmyE+ObruEY=";
+    hash = "sha256-giCPigyLkWv2d8hdXT3ZmYjl7mYRlTxua0N0JpeC/kc=";
   };
 
-  cargoHash = "sha256-yrzqJyWUNO3AYzGxVj3KA/mftr9Su5ZfelWZEnDbWcE=";
+  cargoHash = "sha256-XsGkEy/uNmd2Em+ypDAAVKDeioaGafzFFHVL18Z0pdg=";
   cargoBuildFlags = [
     "--package"
     "lintspec"
diff --git a/pkgs/by-name/ls/lsb-release/package.nix b/pkgs/by-name/ls/lsb-release/package.nix
index 2f2f80c941dc..46c6d2839022 100644
--- a/pkgs/by-name/ls/lsb-release/package.nix
+++ b/pkgs/by-name/ls/lsb-release/package.nix
@@ -7,7 +7,8 @@
 }:
 
 replaceVarsWith {
-  name = "lsb_release";
+  pname = "lsb_release";
+  version = lib.trivial.release;
 
   src = ./lsb_release.sh;
 
diff --git a/pkgs/by-name/lu/lutris-unwrapped/package.nix b/pkgs/by-name/lu/lutris-unwrapped/package.nix
index 26d836486a68..0c6b4425b831 100644
--- a/pkgs/by-name/lu/lutris-unwrapped/package.nix
+++ b/pkgs/by-name/lu/lutris-unwrapped/package.nix
@@ -63,13 +63,13 @@ let
 in
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "lutris-unwrapped";
-  version = "0.5.19";
+  version = "0.5.20";
 
   src = fetchFromGitHub {
     owner = "lutris";
     repo = "lutris";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CAXKnx5+60MITRM8enkYgFl5ZKM6HCXhCYNyG7kHhuQ=";
+    hash = "sha256-ycAlVV5CkLLsk/m17R8k6x40av1wcEVQU2GMbOuc7Bs=";
   };
 
   pyproject = false;
diff --git a/pkgs/by-name/mc/mcl-cpp-utility-lib/package.nix b/pkgs/by-name/mc/mcl-cpp-utility-lib/package.nix
new file mode 100644
index 000000000000..eb4dc2b4c6c8
--- /dev/null
+++ b/pkgs/by-name/mc/mcl-cpp-utility-lib/package.nix
@@ -0,0 +1,46 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+  fmt,
+  catch2_3,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mcl";
+  version = "0.1.14";
+
+  src = fetchFromGitHub {
+    owner = "azahar-emu";
+    repo = "mcl";
+    tag = finalAttrs.version;
+    hash = "sha256-7lHOjlUvCQsct/pijn0M0OOG5LpExmXwB6kH+ostA2I=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+
+  buildInputs = [
+    fmt
+  ];
+
+  checkInputs = [
+    catch2_3
+  ];
+
+  doCheck = true;
+  checkPhase = ''
+    tests/mcl-tests
+  '';
+
+  meta = {
+    description = "Collection of C++20 utilities which is common to a number of merry's projects";
+    homepage = "https://github.com/azahar-emu/mcl";
+    maintainers = with lib.maintainers; [ marcin-serwin ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/md/md2pdf/package.nix b/pkgs/by-name/md/md2pdf/package.nix
new file mode 100644
index 000000000000..32e608f76b83
--- /dev/null
+++ b/pkgs/by-name/md/md2pdf/package.nix
@@ -0,0 +1,9 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication (
+  python3Packages.md2pdf.overridePythonAttrs (oldAttrs: {
+    dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.cli;
+  })
+)
diff --git a/pkgs/by-name/me/mesos-dns/package.nix b/pkgs/by-name/me/mesos-dns/package.nix
index db370a3b8393..c97a4dccbedf 100644
--- a/pkgs/by-name/me/mesos-dns/package.nix
+++ b/pkgs/by-name/me/mesos-dns/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "mesos-dns";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "m3scluster";
     repo = "mesos-dns";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-o0I+pTgN9fb//Q1s9UfpVLUzq5DQVR/qKsr6CYypvsc=";
+    hash = "sha256-922FWRqKGBFB8zQf9nAtlym3b7Fjcg+uaIqEKeRZSro=";
   };
 
   vendorHash = "sha256-l1y3CaGG1ykJnGit81D+E+jB4RUYneQzRMTvOPCH+jk=";
diff --git a/pkgs/by-name/mh/mhost/package.nix b/pkgs/by-name/mh/mhost/package.nix
index ef08dc884b0f..48364f3abca1 100644
--- a/pkgs/by-name/mh/mhost/package.nix
+++ b/pkgs/by-name/mh/mhost/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-08pvkBa2PD7/uko1OOBg6/dCcOM3z9Cp//8mylFCMcE=";
 
-  CARGO_CRATE_NAME = "mhost";
+  env.CARGO_CRATE_NAME = "mhost";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix
index c2e42872e1aa..739d2c1a9a6a 100644
--- a/pkgs/by-name/mi/mimir/package.nix
+++ b/pkgs/by-name/mi/mimir/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "mimir";
-  version = "3.0.2";
+  version = "3.0.3";
 
   src = fetchFromGitHub {
     rev = "mimir-${finalAttrs.version}";
     owner = "grafana";
     repo = "mimir";
-    hash = "sha256-8dym3E6VinpExE4A+ekbhiQ+Zhwvue6/s1mAhBkwPMU=";
+    hash = "sha256-OUFmtHGGDU1+7EwfGVzrjPS2hqba0FfIuQl0V7up9Yk=";
   };
 
   vendorHash = null;
diff --git a/pkgs/servers/minio/default.nix b/pkgs/by-name/mi/minio/package.nix
similarity index 83%
rename from pkgs/servers/minio/default.nix
rename to pkgs/by-name/mi/minio/package.nix
index 69c99f1ef9e8..199e68f5ff9e 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/by-name/mi/minio/package.nix
@@ -28,14 +28,14 @@ let
   #   => "2021"
   versionToYear = version: builtins.elemAt (lib.splitString "-" version) 0;
 in
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "minio";
   version = "2025-10-15T17-29-55Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
-    rev = "RELEASE.${version}";
+    rev = "RELEASE.${finalAttrs.version}";
     hash = "sha256-HbjmCJYkWyRRHKriLP6QohaXYLk3QEVfi32Krq3ujjo=";
   };
 
@@ -56,10 +56,10 @@ buildGoModule rec {
     [
       "-s"
       "-w"
-      "-X ${t}.Version=${versionToTimestamp version}"
-      "-X ${t}.CopyrightYear=${versionToYear version}"
-      "-X ${t}.ReleaseTag=RELEASE.${version}"
-      "-X ${t}.CommitID=${src.rev}"
+      "-X ${t}.Version=${versionToTimestamp finalAttrs.version}"
+      "-X ${t}.CopyrightYear=${versionToYear finalAttrs.version}"
+      "-X ${t}.ReleaseTag=RELEASE.${finalAttrs.version}"
+      "-X ${t}.CommitID=${finalAttrs.src.rev}"
     ];
 
   passthru.tests.minio = nixosTests.minio;
@@ -67,7 +67,7 @@ buildGoModule rec {
   meta = {
     homepage = "https://www.minio.io/";
     description = "S3-compatible object storage server";
-    changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${version}";
+    changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${finalAttrs.version}";
     maintainers = with lib.maintainers; [
       bachp
       ryan4yin
@@ -75,4 +75,4 @@ buildGoModule rec {
     license = lib.licenses.agpl3Plus;
     mainProgram = "minio";
   };
-}
+})
diff --git a/pkgs/by-name/mm/mmdoc/package.nix b/pkgs/by-name/mm/mmdoc/package.nix
index f7945b81c88f..dd09c19978ec 100644
--- a/pkgs/by-name/mm/mmdoc/package.nix
+++ b/pkgs/by-name/mm/mmdoc/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmark-gfm,
   xxd,
-  fastJson,
+  libfastjson,
   libzip,
   ninja,
   meson,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     cmark-gfm
-    fastJson
+    libfastjson
     libzip
   ];
 
diff --git a/pkgs/by-name/mo/monoDLLFixer/package.nix b/pkgs/by-name/mo/monoDLLFixer/package.nix
index 61df37e1fda8..d3bcc56484c0 100644
--- a/pkgs/by-name/mo/monoDLLFixer/package.nix
+++ b/pkgs/by-name/mo/monoDLLFixer/package.nix
@@ -1,6 +1,11 @@
-{ stdenv, perl }:
+{
+  lib,
+  stdenv,
+  perl,
+}:
 stdenv.mkDerivation {
-  name = "mono-dll-fixer";
+  pname = "mono-dll-fixer";
+  version = lib.trivial.release;
   dllFixer = ./dll-fixer.pl;
   dontUnpack = true;
   installPhase = ''
diff --git a/pkgs/by-name/mp/mpv/package.nix b/pkgs/by-name/mp/mpv/package.nix
index fcd9accab107..d08eaaae4562 100644
--- a/pkgs/by-name/mp/mpv/package.nix
+++ b/pkgs/by-name/mp/mpv/package.nix
@@ -104,7 +104,8 @@ let
   );
 in
 symlinkJoin {
-  name = "mpv-with-scripts-${mpv-unwrapped.version}";
+  pname = "mpv-with-scripts";
+  inherit (mpv-unwrapped) version;
 
   # TODO: don't link all mpv outputs
   paths = [ mpv-unwrapped.all ];
diff --git a/pkgs/by-name/mu/mueval/package.nix b/pkgs/by-name/mu/mueval/package.nix
index db216d9958a6..66bcfb1b9c46 100644
--- a/pkgs/by-name/mu/mueval/package.nix
+++ b/pkgs/by-name/mu/mueval/package.nix
@@ -17,7 +17,8 @@ let
 
 in
 stdenv.mkDerivation {
-  name = "mueval-env";
+  pname = "mueval";
+  inherit (haskellPackages.mueval) version;
 
   inherit (haskellPackages) mueval;
 
diff --git a/pkgs/by-name/mu/munge/package.nix b/pkgs/by-name/mu/munge/package.nix
index 47551a1755b5..f955a5668e56 100644
--- a/pkgs/by-name/mu/munge/package.nix
+++ b/pkgs/by-name/mu/munge/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "munge";
-  version = "0.5.17";
+  version = "0.5.18";
 
   src = fetchFromGitHub {
     owner = "dun";
     repo = "munge";
     rev = "munge-${finalAttrs.version}";
-    sha256 = "sha256-MfxED81P4ipdP4fuxwmpNrAeej3ZH+qiHIt5bSrct1o=";
+    sha256 = "sha256-Hoaldm55E0HC3qqqBS5uZvlgcWepnVLyJNQMB2P/t9Q=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix
index 89c5f18cc95f..289997157cbd 100644
--- a/pkgs/by-name/my/myks/package.nix
+++ b/pkgs/by-name/my/myks/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "myks";
-  version = "5.8.1";
+  version = "5.9.1";
 
   src = fetchFromGitHub {
     owner = "mykso";
     repo = "myks";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OzxghyobV91jEbSNTC+Cc9vZt5V+RLTltUajedzv5zw=";
+    hash = "sha256-8vHDWex+xv9E+MYh2FFWj34WJhmfLr+eioVzAm50/TI=";
   };
 
   vendorHash = "sha256-b1uLNz8dSJnJ0tevdm79x9YVas+Wh9//4o+k6fEckZA=";
diff --git a/pkgs/by-name/na/naps2/package.nix b/pkgs/by-name/na/naps2/package.nix
index 003436adb4c7..03a6338a37fd 100644
--- a/pkgs/by-name/na/naps2/package.nix
+++ b/pkgs/by-name/na/naps2/package.nix
@@ -10,6 +10,7 @@
   glib,
   sane-backends,
   libnotify,
+  libtiff,
 }:
 
 buildDotnetModule rec {
@@ -49,6 +50,7 @@ buildDotnetModule rec {
     glib
     sane-backends
     libnotify
+    libtiff
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/nb/nbytes/package.nix b/pkgs/by-name/nb/nbytes/package.nix
index 6ab3d850ce3c..38b45611d4db 100644
--- a/pkgs/by-name/nb/nbytes/package.nix
+++ b/pkgs/by-name/nb/nbytes/package.nix
@@ -12,24 +12,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nbytes";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "nodejs";
     repo = "nbytes";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lsd1Qrv1HEz/5ry10s7Pq7unoh3y9ZmwCaT+6nTlxkc=";
+    hash = "sha256-10l/YrvZPwEdEh/Q170WhZUQzdFEpjy7zeKKzYfyoYc=";
   };
 
   patches = [
     # Use `gtest` from Nixpkgs to allow an offline build
     ./use-nix-googletest.patch
-    # Add support for pkgconfig for use as a shared lib
-    # TODO: remove when included in the next release
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/nbytes/commit/00f48a0620cef800054d4aab061f09d89990a1b9.patch?full_index=1";
-      hash = "sha256-uOPEI70Dq446K56BSFHVyxDHNaYY5OASu3QeWGCLQmI=";
-    })
   ];
 
   outputs = [
diff --git a/pkgs/by-name/ne/networkmanager/package.nix b/pkgs/by-name/ne/networkmanager/package.nix
index 542ce9d60633..fa7bfdfec1d8 100644
--- a/pkgs/by-name/ne/networkmanager/package.nix
+++ b/pkgs/by-name/ne/networkmanager/package.nix
@@ -123,6 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
     # almost cross-compiles, however fails with
     # ** (process:9234): WARNING **: Failed to load shared library '/nix/store/...-networkmanager-aarch64-unknown-linux-gnu-1.38.2/lib/libnm.so.0' referenced by the typelib: /nix/store/...-networkmanager-aarch64-unknown-linux-gnu-1.38.2/lib/libnm.so.0: cannot open shared object file: No such file or directory
     "-Ddocs=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
+    "-Dman=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
     "-Dtests=no"
     "-Dcrypto=gnutls"
     "-Dmobile_broadband_provider_info_database=${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml"
diff --git a/pkgs/by-name/ni/nixtamal/package.nix b/pkgs/by-name/ni/nixtamal/package.nix
index 2ad87f300a7d..5bb0774197e4 100644
--- a/pkgs/by-name/ni/nixtamal/package.nix
+++ b/pkgs/by-name/ni/nixtamal/package.nix
@@ -17,7 +17,7 @@
 
 ocamlPackages.buildDunePackage (finalAttrs: {
   pname = "nixtamal";
-  version = "1.1.0";
+  version = "1.1.1";
   release_year = 2026;
 
   minimalOCamlVersion = "5.3";
@@ -26,7 +26,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
     url = "https://darcs.toastal.in.th/nixtamal/stable/";
     mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ];
     rev = finalAttrs.version;
-    hash = "sha256-Q8EZ8kOyujMxoRU+G0SpTUhT9xi/5MtWnZmQffZzV7s=";
+    hash = "sha256-VYK6ZqEutlVA8ASegLfqnJhLSU5jc2dIL3YOrXrGT0I=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/no/noctalia-shell/package.nix b/pkgs/by-name/no/noctalia-shell/package.nix
index b00e603fdb97..ad18205b0b15 100644
--- a/pkgs/by-name/no/noctalia-shell/package.nix
+++ b/pkgs/by-name/no/noctalia-shell/package.nix
@@ -9,6 +9,7 @@
   quickshell,
 
   # runtime deps
+  bluez,
   brightnessctl,
   cava,
   cliphist,
@@ -29,6 +30,7 @@
   json-glib,
   gobject-introspection,
 
+  bluetoothSupport ? true,
   brightnessctlSupport ? true,
   cavaSupport ? true,
   cliphistSupport ? true,
@@ -45,6 +47,7 @@ let
     wget
     (python3.withPackages (pp: lib.optional calendarSupport pp.pygobject3))
   ]
+  ++ lib.optional bluetoothSupport bluez
   ++ lib.optional brightnessctlSupport brightnessctl
   ++ lib.optional cavaSupport cava
   ++ lib.optional cliphistSupport cliphist
@@ -65,13 +68,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "noctalia-shell";
-  version = "4.4.3";
+  version = "4.5.0";
 
   src = fetchFromGitHub {
     owner = "noctalia-dev";
     repo = "noctalia-shell";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5HqCE5qfW6ItA+ZeFGfTT7/+12QYp/1j93EPdn+nlK0=";
+    hash = "sha256-Y5P0RYO9NKxa4UZBoGmmxtz3mEwJrBOfvdLJRGjV2Os=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix
index 8e6430bfa6cd..cd2c676bca30 100644
--- a/pkgs/by-name/nu/nuclei-templates/package.nix
+++ b/pkgs/by-name/nu/nuclei-templates/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "nuclei-templates";
-  version = "10.3.8";
+  version = "10.3.9";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei-templates";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LLJrG2bmb1eDDvcLBK35GSn6EvDJslXeu/R57wKjzX8=";
+    hash = "sha256-ORKHxs2IdbQIc668A23BKkz3lPUodBEwI07dNfxLuDk=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/nu/numix-icon-theme-square/package.nix b/pkgs/by-name/nu/numix-icon-theme-square/package.nix
index d615722dc8b9..b4a28eff8ba5 100644
--- a/pkgs/by-name/nu/numix-icon-theme-square/package.nix
+++ b/pkgs/by-name/nu/numix-icon-theme-square/package.nix
@@ -10,13 +10,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "numix-icon-theme-square";
-  version = "26.01.11";
+  version = "26.02.11";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = "numix-icon-theme-square";
     rev = version;
-    sha256 = "sha256-fj7CaEUms7w+apaXW+6zMwqCwaLWlU2RJalGzFIaDNg=";
+    sha256 = "sha256-7UDjXJtmHI3FKAvuvHtppqkVIfochwXSvfaM50Mm3R8=";
   };
 
   nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/by-name/nu/nuXmv/package.nix b/pkgs/by-name/nu/nuxmv/package.nix
similarity index 94%
rename from pkgs/by-name/nu/nuXmv/package.nix
rename to pkgs/by-name/nu/nuxmv/package.nix
index 51164773a4d4..ae61e27a36ee 100644
--- a/pkgs/by-name/nu/nuXmv/package.nix
+++ b/pkgs/by-name/nu/nuxmv/package.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "nuXmv";
+  pname = "nuxmv";
   version = "2.0.0";
 
   src = fetchurl {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Symbolic model checker for analysis of finite and infinite state systems";
-    homepage = "https://nuxmv.fbk.eu/pmwiki.php";
+    homepage = "https://nuxmv.fbk.eu/";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ siraben ];
diff --git a/pkgs/by-name/oa/oaknut/package.nix b/pkgs/by-name/oa/oaknut/package.nix
new file mode 100644
index 000000000000..cb8d5305101b
--- /dev/null
+++ b/pkgs/by-name/oa/oaknut/package.nix
@@ -0,0 +1,31 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "oaknut";
+  version = "2.0.3";
+
+  src = fetchFromGitHub {
+    owner = "eden-emulator";
+    repo = "oaknut";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-NWJMottKMiG6Rk2/ACNtBiYfWDsCeSGznPTqVO809P0=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+
+  meta = {
+    description = "Header-only library that allows one to dynamically assemble code in-memory at runtime";
+    homepage = "https://github.com/eden-emulator/oaknut";
+    maintainers = with lib.maintainers; [ marcin-serwin ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/oc/octorus/package.nix b/pkgs/by-name/oc/octorus/package.nix
index f468ceeed8af..3357a2f74baf 100644
--- a/pkgs/by-name/oc/octorus/package.nix
+++ b/pkgs/by-name/oc/octorus/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "octorus";
-  version = "0.3.1";
+  version = "0.3.5";
 
   src = fetchFromGitHub {
     owner = "ushironoko";
     repo = "octorus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-20HVES8XgZEgKIijTzo9rV5IRfhyZlY1noX6yHSUf8g=";
+    hash = "sha256-xVbLh1fe+59KxcZOtCoSAh6O+VdhAyBSGCPP3UZLidA=";
   };
 
-  cargoHash = "sha256-4HHl3SIXqfWOeKFmGqXLTC9veglMAFo1MLJIR/BYr0M=";
+  cargoHash = "sha256-mOHjNQWeEcoBS4OhPj5RRja+b1PCPAeOM49t7OUtx1s=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix
index 9ea88a485e73..aabfc749ac94 100644
--- a/pkgs/by-name/oh/oha/package.nix
+++ b/pkgs/by-name/oh/oha/package.nix
@@ -22,8 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-v+OfQEfAwHxX+FfC0UK2F8/e2tJKaI3zQpg+3hk2hV4=";
 
-  CARGO_PROFILE_RELEASE_LTO = "fat";
-  CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
+  env = {
+    CARGO_PROFILE_RELEASE_LTO = "fat";
+    CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
+  };
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     pkg-config
diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix
index 7db842f22698..1e27490dc9f7 100644
--- a/pkgs/by-name/op/open-policy-agent/package.nix
+++ b/pkgs/by-name/op/open-policy-agent/package.nix
@@ -14,13 +14,13 @@ assert
 
 buildGoModule (finalAttrs: {
   pname = "open-policy-agent";
-  version = "1.13.1";
+  version = "1.13.2";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MBfzoaIZY3u4PtchCzquhrkasjwnARag/UCc5JBTfmw=";
+    hash = "sha256-dQtDFk8Qessso37fjH56xeTNPs9r8WF8YJpkV1tS7U4=";
   };
 
   vendorHash = "sha256-Jn0vi1Ihyeog/LaUcuu/V9dd8l9LSdRSbtH1GPJrT50=";
diff --git a/pkgs/by-name/op/open62541pp/package.nix b/pkgs/by-name/op/open62541pp/package.nix
index ab82afaf1b2f..d69e992e0064 100644
--- a/pkgs/by-name/op/open62541pp/package.nix
+++ b/pkgs/by-name/op/open62541pp/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "open62541pp";
-  version = "0.20.0";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "open62541pp";
     repo = "open62541pp";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-sHB6LLDpg+oA8W2jeIHMTC7YSI2ipUm8LvtNszhbT+c=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-mxrAJjOwRZ85zy6zE0P4z+ToTK3goRZv0xKimUjA69M=";
   };
 
   cmakeFlags = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "C++ wrapper of the open62541 OPC UA library";
     homepage = "https://open62541pp.github.io/open62541pp";
-    changelog = "https://github.com/open62541pp/open62541pp/releases/tag/${finalAttrs.src.rev}";
+    changelog = "https://github.com/open62541pp/open62541pp/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ sikmir ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix
index eb6004f49660..57af4fb5e5d7 100644
--- a/pkgs/by-name/op/openfga/package.nix
+++ b/pkgs/by-name/op/openfga/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "openfga";
-  version = "1.11.4";
+  version = "1.11.5";
 
   src = fetchFromGitHub {
     owner = "openfga";
     repo = "openfga";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-MhxDlJzAScmf8J42WrsgVzSasiIhzqprrU9TqoY2bzk=";
+    hash = "sha256-5VS3sx4sHiJvWFDFw929Q5n6OZfCSHPgqtHgLEEeqHQ=";
   };
 
   vendorHash = "sha256-m2ddB7yfZmTwWKvf/lTzmc2D4lR1JXc5sFlRgAi+q+s=";
diff --git a/pkgs/by-name/op/openvswitch/package.nix b/pkgs/by-name/op/openvswitch/package.nix
index 8437f1011a78..a49571845bf0 100644
--- a/pkgs/by-name/op/openvswitch/package.nix
+++ b/pkgs/by-name/op/openvswitch/package.nix
@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = if withDPDK then "openvswitch-dpdk" else "openvswitch";
-  version = "3.6.1";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "openvswitch";
     repo = "ovs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I5ISLOu1MMT/mtyH4tcgdFe2zjSsutMWkJiPIbadbQI=";
+    hash = "sha256-3lbehoy3hbwuM4tXbtfQCXULFr1VQpjsSQ3fZzZcR4U=";
   };
 
   outputs = [
@@ -171,8 +171,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       adamcstephens
       booxter
-      kmcopper
-      netixx
       xddxdd
     ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/pa/pacu/package.nix b/pkgs/by-name/pa/pacu/package.nix
index 58243ee976ba..f9a9f1d4914e 100644
--- a/pkgs/by-name/pa/pacu/package.nix
+++ b/pkgs/by-name/pa/pacu/package.nix
@@ -13,7 +13,7 @@ let
 in
 python.pkgs.buildPythonApplication (finalAttrs: {
   pname = "pacu";
-  version = "1.6.0";
+  version = "1.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -52,6 +52,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
     sqlalchemy
     sqlalchemy-utils
     toml
+    types-urllib3
     typing-extensions
     urllib3
   ]);
@@ -71,6 +72,10 @@ python.pkgs.buildPythonApplication (finalAttrs: {
     # sAttributeError: module 'moto' has no attribute 'mock_s3'
     "test_update"
     "test_update_second_time"
+
+    # AttributeError: module 'moto' has no attribute 'mock_cognitoidp'
+    "test_cognito__attack_minimal"
+    "test_cognito__attack_sanity"
   ];
 
   meta = {
diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 0b083ecfeec6..5e59d3204026 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -29,13 +29,13 @@
   lndir,
 }:
 let
-  version = "2.20.6";
+  version = "2.20.7";
 
   src = fetchFromGitHub {
     owner = "paperless-ngx";
     repo = "paperless-ngx";
     tag = "v${version}";
-    hash = "sha256-rTkkvSkgYQtT9KglXsyf4SWwjoJWtX5YwcVUbEbLac0=";
+    hash = "sha256-NVlV+iHtUx05EIuHx/WePRf558DH977oZ7C8iNW0QR4=";
   };
 
   python = python3.override {
@@ -56,7 +56,7 @@ let
       };
 
       # tesseract5 may be overwritten in the paperless module and we need to propagate that to make the closure reduction effective
-      ocrmypdf = prev.ocrmypdf.override { tesseract = tesseract5; };
+      ocrmypdf = prev.ocrmypdf_16.override { tesseract = tesseract5; };
     };
   };
 
@@ -163,6 +163,8 @@ python.pkgs.buildPythonApplication rec {
       --replace-fail '--maxprocesses=16' "--numprocesses=$NIX_BUILD_CORES"
   '';
 
+  build-system = [ python.pkgs.setuptools ];
+
   nativeBuildInputs = [
     gettext
     lndir
@@ -171,10 +173,12 @@ python.pkgs.buildPythonApplication rec {
   pythonRelaxDeps = [
     "celery"
     "django-allauth"
+    "django-auditlog"
     "drf-spectacular-sidecar"
     "python-dotenv"
     "gotenberg-client"
     "redis"
+    "scikit-learn"
     # requested by maintainer
     "ocrmypdf"
   ];
@@ -302,11 +306,11 @@ python.pkgs.buildPythonApplication rec {
     "src"
   ];
 
-  # The tests require:
-  # - PATH with runtime binaries
-  # - A temporary HOME directory for gnupg
-  # - XDG_DATA_DIRS with test-specific fonts
   preCheck = ''
+    # The tests require:
+    # - PATH with runtime binaries
+    # - A temporary HOME directory for gnupg
+    # - XDG_DATA_DIRS with test-specific fonts
     export PATH="${path}:$PATH"
     export HOME=$(mktemp -d)
     export XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS"
@@ -315,27 +319,26 @@ python.pkgs.buildPythonApplication rec {
     # ocrmypdf has an internal limit of 256 jobs and will fail with more:
     # https://github.com/ocrmypdf/OCRmyPDF/blob/66308c281306302fac3470f587814c3b212d0c40/src/ocrmypdf/cli.py#L234
     export PAPERLESS_THREADS_PER_WORKER=$(( NIX_BUILD_CORES > 256 ? 256 : NIX_BUILD_CORES ))
+
+    # the generated pyc files conflict when running the tests
+    rm -r build/lib
   '';
 
   disabledTests = [
     # FileNotFoundError(2, 'No such file or directory'): /build/tmp...
     "test_script_with_output"
     "test_script_exit_non_zero"
-    "testDocumentPageCountMigrated"
-    # AssertionError: 10 != 4 (timezone/time issue)
-    # Due to getting local time from modification date in test_consumer.py
-    "testNormalOperation"
     # Something broken with new Tesseract and inline RTL/LTR overrides?
     "test_rtl_language_detection"
-    # django.core.exceptions.FieldDoesNotExist: Document has no field named 'transaction_id'
-    "test_convert"
     # Favicon tests fail due to static file handling in the test environment
+    # https://github.com/NixOS/nixpkgs/issues/421393
     "test_favicon_view"
     "test_favicon_view_missing_file"
     # Requires DNS
     "test_send_webhook_data_or_json"
-    "test_workflow_webhook_send_webhook_retry"
-    "test_workflow_webhook_send_webhook_task"
+    # execnet.gateway_base.DumpError: can't serialize <class 'pathlib._local.PosixPath'>
+    # https://github.com/pytest-dev/pytest-xdist/issues/384
+    "test_subdirectory_upload"
   ];
 
   doCheck = !stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix
index e37ad28a5a84..1078ab396b75 100644
--- a/pkgs/by-name/pa/patch2pr/package.nix
+++ b/pkgs/by-name/pa/patch2pr/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "patch2pr";
-  version = "0.41.0";
+  version = "0.42.0";
 
   src = fetchFromGitHub {
     owner = "bluekeyes";
     repo = "patch2pr";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-mln6MVPZRbW2XgTaVAGiK87MkHPPEzFgHaNnacKym8g=";
+    hash = "sha256-3VrUp9JmZLHIknXneMa5IixRkjWFzTLanVGhSagSams=";
   };
 
-  vendorHash = "sha256-nLpS0JbdqFMK2+ycZZC93HWPCS0+k7tyl1pB/T6fPjA=";
+  vendorHash = "sha256-zpyyz0C+lJKFjKgaUnO3R5kmujIXCzM16UvcXcNQnVw=";
 
   ldflags = [
     "-X main.version=${finalAttrs.version}"
diff --git a/pkgs/by-name/pd/pdfmixtool/package.nix b/pkgs/by-name/pd/pdfmixtool/package.nix
index e8efb967babb..b04dc0153d2c 100644
--- a/pkgs/by-name/pd/pdfmixtool/package.nix
+++ b/pkgs/by-name/pd/pdfmixtool/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdfmixtool";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitLab {
     owner = "scarpetta";
     repo = "pdfmixtool";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-UuRTMLlUIyo2RF+XjI229kkE67ybmllIy98p97PjWCE=";
+    hash = "sha256-+omL0WNU34BcWbsfK3FXfhp0DVWjm9Vb5OVjRCoT/IA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/servers/persistent-evdev/default.nix b/pkgs/by-name/pe/persistent-evdev/package.nix
similarity index 83%
rename from pkgs/servers/persistent-evdev/default.nix
rename to pkgs/by-name/pe/persistent-evdev/package.nix
index d7fd26d134b3..309a2f749980 100644
--- a/pkgs/servers/persistent-evdev/default.nix
+++ b/pkgs/by-name/pe/persistent-evdev/package.nix
@@ -1,25 +1,23 @@
 {
   lib,
-  buildPythonPackage,
+  python3Packages,
   fetchFromGitHub,
-  evdev,
-  pyudev,
   udevCheckHook,
 }:
 
-buildPythonPackage rec {
+python3Packages.buildPythonPackage {
   pname = "persistent-evdev";
   version = "unstable-2022-05-07";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "aiberia";
-    repo = pname;
+    repo = "persistent-evdev";
     rev = "52bf246464e09ef4e6f2e1877feccc7b9feba164";
-    sha256 = "d0i6DL/qgDELet4ew2lyVqzd9TApivRxL3zA3dcsQXY=";
+    hash = "sha256-d0i6DL/qgDELet4ew2lyVqzd9TApivRxL3zA3dcsQXY=";
   };
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3Packages; [
     evdev
     pyudev
   ];
diff --git a/pkgs/by-name/ph/photoview/package.nix b/pkgs/by-name/ph/photoview/package.nix
new file mode 100644
index 000000000000..cc636254147b
--- /dev/null
+++ b/pkgs/by-name/ph/photoview/package.nix
@@ -0,0 +1,81 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  callPackage,
+  makeWrapper,
+  pkg-config,
+  # Native dependencies for image processing and face recognition
+  dlib,
+  libjpeg,
+  libheif,
+  blas,
+  lapack,
+  # Runtime dependencies
+  exiftool,
+  darktable,
+  ffmpeg,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "photoview";
+  version = "2.4.0";
+
+  src = fetchFromGitHub {
+    owner = "photoview";
+    repo = "photoview";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-ZfvBdQlyqONsrviZGL22Kt+AiPaVWwdoREDUrHDYyIs=";
+  };
+
+  vendorHash = "sha256-Tn4OxSV41s/4n2Q3teJRJNc39s6eKW4xE9wW/CIR5Fg=";
+
+  modRoot = "api";
+
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+  ];
+
+  buildInputs = [
+    dlib
+    libjpeg
+    libheif
+    blas
+    lapack
+  ];
+
+  postInstall = ''
+    # Install face recognition models
+    mkdir -p $out/share/photoview
+    cp -r ${finalAttrs.src}/api/data $out/share/photoview/
+
+    # Symlink the UI
+    ln -s ${finalAttrs.passthru.ui} $out/share/photoview/ui
+
+    # Rename binary and wrap with runtime dependencies
+    mv $out/bin/api $out/bin/photoview
+    wrapProgram $out/bin/photoview \
+      --set PHOTOVIEW_FACE_RECOGNITION_MODELS_PATH $out/share/photoview/data/models \
+      --set PHOTOVIEW_UI_PATH $out/share/photoview/ui \
+      --set PHOTOVIEW_SERVE_UI 1 \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          exiftool
+          darktable
+          ffmpeg
+        ]
+      }
+  '';
+
+  passthru.ui = callPackage ./ui.nix { inherit (finalAttrs) src version; };
+
+  meta = {
+    description = "Photo gallery for self-hosted personal servers";
+    homepage = "https://photoview.github.io/";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ nettika ];
+    mainProgram = "photoview";
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/ph/photoview/ui.nix b/pkgs/by-name/ph/photoview/ui.nix
new file mode 100644
index 000000000000..bbaa5d3e95a3
--- /dev/null
+++ b/pkgs/by-name/ph/photoview/ui.nix
@@ -0,0 +1,32 @@
+{
+  src,
+  version,
+  lib,
+  buildNpmPackage,
+}:
+
+buildNpmPackage {
+  pname = "photoview-ui";
+  inherit version;
+
+  src = "${src}/ui";
+
+  npmDepsHash = "sha256-wUbfq+7SuJUBxfy9TxHVda8A0g4mmYCbzJT64XBN2mI=";
+
+  NODE_ENV = "production";
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out
+    cp -r dist/* $out/
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Web UI for Photoview photo gallery";
+    homepage = "https://photoview.github.io/";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ nettika ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/by-name/pi/pihole-web/package.nix b/pkgs/by-name/pi/pihole-web/package.nix
index 9eac557b8f20..d3a0d978d8cf 100644
--- a/pkgs/by-name/pi/pihole-web/package.nix
+++ b/pkgs/by-name/pi/pihole-web/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pihole-web";
-  version = "6.4";
+  version = "6.4.1";
 
   src = fetchFromGitHub {
     owner = "pi-hole";
     repo = "web";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zIuDqDL6JO8JLr+u+XWBRxweK67KBztvqUp00MshbYQ=";
+    hash = "sha256-0nhMbOEZ4Q4XxOvskcEbDkK4HqdosgAzdRF4sT9+zjQ=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix
index f205b64999b2..a0b13b5161f3 100644
--- a/pkgs/by-name/pi/pik/package.nix
+++ b/pkgs/by-name/pi/pik/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pik";
-  version = "0.28.1";
+  version = "0.29.0";
 
   src = fetchFromGitHub {
     owner = "jacek-kurlit";
     repo = "pik";
     rev = finalAttrs.version;
-    hash = "sha256-pDfqqQcYrK78OylwOiKc/Orul03MjdZxEHhpr8obm84=";
+    hash = "sha256-SXSMYvpFLT4sYb1UxC4SoOXL5J2V0/hSL5p2Wa/Ba00=";
   };
 
-  cargoHash = "sha256-/2E5VZt2/xWtPy4Zpo8lVn4sXR4Gq6+NJkKpNM7hOVg=";
+  cargoHash = "sha256-+7sUlqi3cv3GksVMMCgrcbGgkCIQZCWEco5LpXo7p2w=";
 
   passthru.tests.version = testers.testVersion { package = pik; };
 
diff --git a/pkgs/by-name/pl/platformio-core/package.nix b/pkgs/by-name/pl/platformio-core/package.nix
index 8f2c6cee1962..f335bbe37d0d 100644
--- a/pkgs/by-name/pl/platformio-core/package.nix
+++ b/pkgs/by-name/pl/platformio-core/package.nix
@@ -23,6 +23,8 @@ let
           tag = version;
           hash = "sha256-l5pEhv8D6jRlU24SlsGQEkXda/b7KUdP9mAqrZCbl38=";
         };
+
+        propagatedBuildInputs = with python3.pkgs; [ packaging ];
       });
     };
   };
diff --git a/pkgs/servers/polaris/web.nix b/pkgs/by-name/po/polaris-web/package.nix
similarity index 90%
rename from pkgs/servers/polaris/web.nix
rename to pkgs/by-name/po/polaris-web/package.nix
index 6e524bbe18e8..da681f9ae641 100644
--- a/pkgs/servers/polaris/web.nix
+++ b/pkgs/by-name/po/polaris-web/package.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
   pname = "polaris-web";
   version = "69";
 
   src = fetchFromGitHub {
     owner = "agersant";
     repo = "polaris-web";
-    rev = "build-${version}";
+    tag = "build-${finalAttrs.version}";
     hash = "sha256-/UmAOunc/79DpZByUrzqNA7q7JNugEceKRZvyTGhtVQ=";
   };
 
@@ -36,4 +36,4 @@ buildNpmPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pbsds ];
   };
-}
+})
diff --git a/pkgs/servers/polaris/default.nix b/pkgs/by-name/po/polaris/package.nix
similarity index 93%
rename from pkgs/servers/polaris/default.nix
rename to pkgs/by-name/po/polaris/package.nix
index bd276dbc6dc6..a8d16f86bb9c 100644
--- a/pkgs/servers/polaris/default.nix
+++ b/pkgs/by-name/po/polaris/package.nix
@@ -7,14 +7,14 @@
   nixosTests,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "polaris";
   version = "0.14.3";
 
   src = fetchFromGitHub {
     owner = "agersant";
     repo = "polaris";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-2GHYIlEzRS7KXahdrxMjyIcPCNw8gXJw5/4ZpB/zT3Y=";
 
     # The polaris version upstream in Cargo.lock is "0.0.0".
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
     postFetch = ''
       # 'substituteInPlace' does not support multiline replacements?
       sed -i $out/Cargo.lock -z \
-        -e 's/\[\[package\]\]\nname = "polaris"\nversion = "0.0.0"/[[package]]\nname = "polaris"\nversion = "'"${version}"'"/g'
+        -e 's/\[\[package\]\]\nname = "polaris"\nversion = "0.0.0"/[[package]]\nname = "polaris"\nversion = "'"${finalAttrs.version}"'"/g'
     '';
   };
 
@@ -66,4 +66,4 @@ rustPlatform.buildRustPackage rec {
     platforms = lib.platforms.unix;
     mainProgram = "polaris";
   };
-}
+})
diff --git a/pkgs/by-name/pr/pragha/package.nix b/pkgs/by-name/pr/pragha/package.nix
index 7ea647aeec8a..e4d45b2e43c1 100644
--- a/pkgs/by-name/pr/pragha/package.nix
+++ b/pkgs/by-name/pr/pragha/package.nix
@@ -20,7 +20,7 @@
   withGstPlugins ? true,
   glyr,
   withGlyr ? true,
-  liblastfmSF,
+  liblastfm-vambrose,
   withLastfm ? true,
   libcdio-paranoia,
   withCD ? true,
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional withGudev libgudev
     ++ lib.optional withKeybinder keybinder3
     ++ lib.optional withLibnotify libnotify
-    ++ lib.optional withLastfm liblastfmSF
+    ++ lib.optional withLastfm liblastfm-vambrose
     ++ lib.optional withGlyr glyr
     ++ lib.optional withLibsoup libsoup_2_4
     ++ lib.optional withMtp libmtp
diff --git a/pkgs/by-name/pr/prisma_6/package.nix b/pkgs/by-name/pr/prisma_6/package.nix
index bf2ac5b5fc27..6dbd49fde35e 100644
--- a/pkgs/by-name/pr/prisma_6/package.nix
+++ b/pkgs/by-name/pr/prisma_6/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Fetch CLI workspace dependencies
     deps_json=$(pnpm list --filter ./packages/cli --prod --depth Infinity --json)
-    deps=$(jq -r '[.. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json")
+    deps=$(jq -r '[del(.. | .unsavedDependencies?) | .. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json")
 
     # Remove unnecessary external dependencies
     find . -name node_modules -type d -prune -exec rm -rf {} +
diff --git a/pkgs/by-name/pr/prisma_7/package.nix b/pkgs/by-name/pr/prisma_7/package.nix
index 786df96e015a..93fc219f2092 100644
--- a/pkgs/by-name/pr/prisma_7/package.nix
+++ b/pkgs/by-name/pr/prisma_7/package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Fetch CLI workspace dependencies
     deps_json=$(pnpm list --filter ./packages/cli --prod --depth Infinity --json)
-    deps=$(jq -r '[.. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json")
+    deps=$(jq -r '[del(.. | .unsavedDependencies?) | .. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json")
 
     # Remove unnecessary external dependencies
     find . -name node_modules -type d -prune -exec rm -rf {} +
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/by-name/pr/prosody/package.nix
similarity index 100%
rename from pkgs/servers/xmpp/prosody/default.nix
rename to pkgs/by-name/pr/prosody/package.nix
diff --git a/pkgs/by-name/pr/protoc-gen-es/package.nix b/pkgs/by-name/pr/protoc-gen-es/package.nix
index 8c9fb09788c6..74f373c2f3a2 100644
--- a/pkgs/by-name/pr/protoc-gen-es/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-es/package.nix
@@ -7,20 +7,20 @@
 
 buildNpmPackage rec {
   pname = "protoc-gen-es";
-  version = "2.10.2";
+  version = "2.11.0";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "protobuf-es";
     tag = "v${version}";
-    hash = "sha256-6YzxDf8NbBWn3sWqdeQLIUiKQa0DIvBWfigV7hKv+p0=";
+    hash = "sha256-fH/gp7+MU7W8FESJTr4do6FIqXpxS4v6fAxa4xc+vKw=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json
     '';
   };
 
-  npmDepsHash = "sha256-nS2PFNwZUrHk6onEV2I9O7ZoN/c9bRIQ+D3oXnFd7dU=";
+  npmDepsHash = "sha256-UW17BQoPv5sfQT52n6PBQrwArInDvQptneF3bgKEXTY=";
 
   npmWorkspace = "packages/protoc-gen-es";
 
diff --git a/pkgs/by-name/pr/protoc-gen-validate/package.nix b/pkgs/by-name/pr/protoc-gen-validate/package.nix
index 841c6b503a53..ae0e787357c0 100644
--- a/pkgs/by-name/pr/protoc-gen-validate/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-validate/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "protoc-gen-validate";
-  version = "1.3.0";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "protoc-gen-validate";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-225D0iHM+fTYIu/+HPkGZ8IcqbP4FMkf7Lw1wI02rZw=";
+    sha256 = "sha256-4KmYDfitAYLfdgTUg3SlQLjWoYBnGOuF7C3xHWm/lNM=";
   };
 
-  vendorHash = "sha256-R9zcjoMiq69pPbXAahOp1RJNvlgsASuCwbxkwLbMomg=";
+  vendorHash = "sha256-r4oT4Jd21hQccvGEqOXpEKqUy6lvMKN+vF8e2KxY6oQ=";
 
   excludedPackages = [ "tests" ];
 
diff --git a/pkgs/by-name/pr/prototypejs/package.nix b/pkgs/by-name/pr/prototypejs/package.nix
index 9ac7a68943b3..d9db3009327a 100644
--- a/pkgs/by-name/pr/prototypejs/package.nix
+++ b/pkgs/by-name/pr/prototypejs/package.nix
@@ -1,10 +1,10 @@
 { lib, fetchurl, ... }:
-let
+fetchurl (finalAttrs: {
+  pname = "prototype";
   version = "1.7.3.0";
-in
-fetchurl {
-  name = "prototype-${version}.js";
-  url = "https://ajax.googleapis.com/ajax/libs/prototype/${version}/prototype.js";
+  name = "${finalAttrs.pname}-${finalAttrs.version}.js";
+
+  url = "https://ajax.googleapis.com/ajax/libs/prototype/${finalAttrs.version}/prototype.js";
   sha256 = "0q43vvrsb22h4jvavs1gk3v4ps61yx9k85b5n6q9mxivhmxprg26";
 
   meta = {
@@ -21,4 +21,4 @@ fetchurl {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ das_j ];
   };
-}
+})
diff --git a/pkgs/by-name/pr/prow/package.nix b/pkgs/by-name/pr/prow/package.nix
index 42e80a9f06a5..2cbaa9757cd2 100644
--- a/pkgs/by-name/pr/prow/package.nix
+++ b/pkgs/by-name/pr/prow/package.nix
@@ -8,15 +8,15 @@
 
 buildGoModule rec {
   pname = "prow";
-  version = "0-unstable-2026-02-06";
-  rev = "85e3dda3b79520c15cd101b85b52ccf4f7e1f1e6";
+  version = "0-unstable-2026-02-17";
+  rev = "999e46ca7aee8a1561241b965222140ebc29120c";
 
   src = fetchFromGitHub {
     inherit rev;
 
     owner = "kubernetes-sigs";
     repo = "prow";
-    hash = "sha256-1x0RKRYi7HruNJJwAhPQ+sIcKKwdyyI3cysBQvY2Z8Y=";
+    hash = "sha256-EzP0Yd3cMstMhPGBD+3dUJE4NL0YnJTGip/tTDj/Rfw=";
   };
 
   vendorHash = "sha256-Pv9LznRh7Nzm74gMKT2Q/VLIMIIc93en0qX6YA6TwK4=";
diff --git a/pkgs/by-name/ps/pspg/package.nix b/pkgs/by-name/ps/pspg/package.nix
index 8be74b56c532..122007e0448f 100644
--- a/pkgs/by-name/ps/pspg/package.nix
+++ b/pkgs/by-name/ps/pspg/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pspg";
-  version = "5.8.15";
+  version = "5.8.16";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = "pspg";
     rev = finalAttrs.version;
-    sha256 = "sha256-wYGU9vaAgY87RTbOXOGBVV37ZN/+NceXWgoEaY95md4=";
+    sha256 = "sha256-7x1hTEl2WoOXZTbPfb/t0w4tl09paDD/uIPuyhLlMbk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pu/pulumi-bin/data.nix b/pkgs/by-name/pu/pulumi-bin/data.nix
index ab55547f25c1..874830705129 100644
--- a/pkgs/by-name/pu/pulumi-bin/data.nix
+++ b/pkgs/by-name/pu/pulumi-bin/data.nix
@@ -1,16 +1,16 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "3.220.0";
+  version = "3.221.0";
   pulumiPkgs = {
     x86_64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.220.0-linux-x64.tar.gz";
-        sha256 = "1zs5mpy4rcgv0fadbb6pv95kq75152rpngch676j2n63w2awa03g";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.221.0-linux-x64.tar.gz";
+        sha256 = "1bdrblxcyai88a52qw2zq998ar0yl3fk83l7b7w98gqmnj8nywzy";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-linux-amd64.tar.gz";
-        sha256 = "02ffwlprcqn8n7ghpmb6s33gfg03vizvah4zxkqi69dp6q3l3hws";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.49.0-linux-amd64.tar.gz";
+        sha256 = "0rz3bfdpy20f82cj2ja5nag829l01cy5kpc2qshl1i6sh70f2q0y";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-linux-amd64.tar.gz";
@@ -57,8 +57,8 @@
         sha256 = "1k0ssdiby049ycl0q2bym94vx3apnxqkay61iyv3b0ssh6447zp0";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.57.0-linux-amd64.tar.gz";
-        sha256 = "0b7naqlw20v2hllc48y485ypcaw2qsi5ng0kwmm0zg6zdjx6and7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.58.0-linux-amd64.tar.gz";
+        sha256 = "0v533qvfsibdmw17p0byk1xcl290kljryd6fd6j0mkg3gyw7gbx0";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-linux-amd64.tar.gz";
@@ -73,8 +73,8 @@
         sha256 = "0lh7qzaxqplnc6liqvgccczyl7fhgnnmxv1ivwf88pmrpzq2l1n0";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.11.0-linux-amd64.tar.gz";
-        sha256 = "0yaxcpc5zrl31jyrwl7yfyva27nxsjcgx6cinvhq3rhisknsz8xp";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.12.0-linux-amd64.tar.gz";
+        sha256 = "167mfp0h67s3ma5idl81mlqpsbflnrs4z7xg035clwg0lwq6m00j";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-linux-amd64.tar.gz";
@@ -89,8 +89,8 @@
         sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.0-linux-amd64.tar.gz";
-        sha256 = "0324c2x4x7gfyg3xis3fi7qy8j1ccw8871b8qyh09cndwlh4ghg1";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.1-linux-amd64.tar.gz";
+        sha256 = "19k79m8dhkiy4x4rs6dq4zkfczjsnmc0mvbh57b5l52imsv7ks7m";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.25.0-linux-amd64.tar.gz";
@@ -163,12 +163,12 @@
     ];
     x86_64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.220.0-darwin-x64.tar.gz";
-        sha256 = "1vly2arzfn69a92v5mpf6yc1a15rnc4bh1f20zpcsq7mvfdjrfr1";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.221.0-darwin-x64.tar.gz";
+        sha256 = "0szvz9wwvr6ijv45sbmkxawnbyph8pknnly99bf909ra3kr5y9vc";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-darwin-amd64.tar.gz";
-        sha256 = "1zjs31cdhc9wryxigf5x1r88hkcvqsizkxdwydd1cn2svlc1pkik";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.49.0-darwin-amd64.tar.gz";
+        sha256 = "14zxzrjcmyjg0fvdmm9jf4lb4zx6vlj125j2hy0m99yy1ngqrw4c";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-darwin-amd64.tar.gz";
@@ -215,8 +215,8 @@
         sha256 = "0bj5mb05sakzmar8g5bymamfyixkdl99ccw4xglb4syxhv97cp91";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.57.0-darwin-amd64.tar.gz";
-        sha256 = "1bxvgri8ics1x84kh7l7lqw558x1pgbxhp6c9ph0ma56acbhv2x7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.58.0-darwin-amd64.tar.gz";
+        sha256 = "12pr6haz9s304aws4id4csvalh2ifqack5mp7lz3l2f8gy6aa4xb";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-darwin-amd64.tar.gz";
@@ -231,8 +231,8 @@
         sha256 = "1qr6395rkb2bfd2qi3aifi1z78mlp5kap5kb605j9l0ml5q4ybb4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.11.0-darwin-amd64.tar.gz";
-        sha256 = "1a6xw351y2x1aadbrww4j8zwyfvhbs71wbyrkkp8br806yq0ysdp";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.12.0-darwin-amd64.tar.gz";
+        sha256 = "1y5bhjzv7pcnk6h2rhl0lib8nlvbfdh87ilgfydy757gn99wqi03";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-darwin-amd64.tar.gz";
@@ -247,8 +247,8 @@
         sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.0-darwin-amd64.tar.gz";
-        sha256 = "1zpc8gdjgj7if0cv1vmn9m2p4x0mc9ab6a1x3k16xmq0qcd4by2p";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.1-darwin-amd64.tar.gz";
+        sha256 = "04rmlydspvgbcgn7qd9sk0bd70axz2rmpiydfw383352bxrinlvs";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.25.0-darwin-amd64.tar.gz";
@@ -321,12 +321,12 @@
     ];
     aarch64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.220.0-linux-arm64.tar.gz";
-        sha256 = "0sznqiqc5n3y8spdixmp3fb4dcprchcc75mssmb3gk6q8c7yw016";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.221.0-linux-arm64.tar.gz";
+        sha256 = "0dvsymd37g9vxli5mzh9fy3kzi7yaq5qcd343zys87c5idx0gbxs";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-linux-arm64.tar.gz";
-        sha256 = "0l2chxskd3lafgg7b04zv8y9p4hm3q29v1vjlky99anbcg0wjknw";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.49.0-linux-arm64.tar.gz";
+        sha256 = "18km9lhzyvvlcx97yyxnh0mfrfr9sc6c9ypj6asksvjz3fsmgjkb";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-linux-arm64.tar.gz";
@@ -373,8 +373,8 @@
         sha256 = "0wzfnvckhl1xq66j2kic3hzi1spvyz2mi2cj8rbhywilb429llhk";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.57.0-linux-arm64.tar.gz";
-        sha256 = "161jv9dxwihgigyc6y349l4dyqax54p44ayb14mdrnxjjiy8wlmz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.58.0-linux-arm64.tar.gz";
+        sha256 = "107i65fd2j5f08bwzwdjjhdhvn7ghy64m63mzbjrqssawma0r3wc";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-linux-arm64.tar.gz";
@@ -389,8 +389,8 @@
         sha256 = "1vl4mszkbh0m2vf55rx5bb5bkjd72nf4npmp21878fdhyrq23p3r";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.11.0-linux-arm64.tar.gz";
-        sha256 = "08178lhqkxcl2016xhd7zhiqzhm8cvj9kzmbaz187h0cj1db697q";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.12.0-linux-arm64.tar.gz";
+        sha256 = "1a57fvnl1wixghs4gvv534rj5qy8z9zjb1nc6gg02ayn4q5720cy";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-linux-arm64.tar.gz";
@@ -405,8 +405,8 @@
         sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.0-linux-arm64.tar.gz";
-        sha256 = "00hk4bl7vdw39ygxzzgp1a90fa2gm4x0phvppfg748m8dm0wp1mb";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.1-linux-arm64.tar.gz";
+        sha256 = "094pmichc66fnd38vfn4hb2dl3v88vqfx00smk0b19fdbrafcp5j";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.25.0-linux-arm64.tar.gz";
@@ -479,12 +479,12 @@
     ];
     aarch64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.220.0-darwin-arm64.tar.gz";
-        sha256 = "0pjvlyllqg9pbs2w5am10nza67wwnhbdyhir2zld45zfyak9sbjb";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.221.0-darwin-arm64.tar.gz";
+        sha256 = "14k0q3q5mkni934gxrbg44hwhwy6knhzjk6hr6n0qi1i87r28c2d";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-darwin-arm64.tar.gz";
-        sha256 = "027y13r0f84kqcpfirwzyilnsmbn9240dsbdk1jl97m04zp0djhn";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.49.0-darwin-arm64.tar.gz";
+        sha256 = "1295bxz4n7mmi0ijiq6nx1hv7n9vbwcwi0wfrj27fbipwpkbk2wb";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-darwin-arm64.tar.gz";
@@ -531,8 +531,8 @@
         sha256 = "0nw2mcn03mnrvlhc3ykf43im1nmnwc5c2707nqzl9fwxhm25dhc9";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.57.0-darwin-arm64.tar.gz";
-        sha256 = "0gi3cnlcyqy2aq7vxi4kpgl1bfqbax58fawjxg93qjr405g9ilih";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.58.0-darwin-arm64.tar.gz";
+        sha256 = "08j85v5i4f5jj0kg816bhxc20br8a9i6hd3i1x0p7g7qvm7ypjvr";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-darwin-arm64.tar.gz";
@@ -547,8 +547,8 @@
         sha256 = "068bdlp98cp1lfhbigkw16hqyflb95kh7my2s8wgb7hjnf580xwv";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.11.0-darwin-arm64.tar.gz";
-        sha256 = "17mdijhdi1w8b00y5rn86l61jd3ib8p7xda3zhhc8b288c9qwjlk";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.12.0-darwin-arm64.tar.gz";
+        sha256 = "0d77pwhqmvm4g4ix86g566jakja6y59b0s57mxnffyfsvirm2m61";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-darwin-arm64.tar.gz";
@@ -563,8 +563,8 @@
         sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.0-darwin-arm64.tar.gz";
-        sha256 = "18k8g8dh9rkmkn9d68m21wh27g5ynliafzs8ljg6svkg0vmiyw7k";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.1-darwin-arm64.tar.gz";
+        sha256 = "150kg8brpsazpdd6laywwvbrjmzl4n3w7saf9vidiwsv01zpl90m";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.25.0-darwin-arm64.tar.gz";
diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix
index 0d1b31a0a266..4a922722c45a 100644
--- a/pkgs/by-name/py/pyrefly/package.nix
+++ b/pkgs/by-name/py/pyrefly/package.nix
@@ -10,17 +10,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pyrefly";
-  version = "0.52.0";
+  version = "0.53.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "pyrefly";
     tag = finalAttrs.version;
-    hash = "sha256-UvYM+j26qIe5yQNp0ttEvdrEoYFDvWY6xFGS0bMFXT4=";
+    hash = "sha256-tw4VQw0liyPjZBZxP7U79JLdJcSuitMr53lVdtje5KE=";
   };
 
   buildAndTestSubdir = "pyrefly";
-  cargoHash = "sha256-gzaRZys2F9fyv0Q0gAAg3UdxF9rMMI6+lzZPhnrVC00=";
+  cargoHash = "sha256-+LwF0PHBU+do+eg84PGMEt3ri9LjMD+e2p82i2icwh4=";
 
   buildInputs = [ rust-jemalloc-sys ];
 
diff --git a/pkgs/servers/misc/qremotecontrol-server/0001-fix-qt5-build-include-QDataStream.patch b/pkgs/by-name/qr/qremotecontrol-server/0001-fix-qt5-build-include-QDataStream.patch
similarity index 100%
rename from pkgs/servers/misc/qremotecontrol-server/0001-fix-qt5-build-include-QDataStream.patch
rename to pkgs/by-name/qr/qremotecontrol-server/0001-fix-qt5-build-include-QDataStream.patch
diff --git a/pkgs/servers/misc/qremotecontrol-server/default.nix b/pkgs/by-name/qr/qremotecontrol-server/package.nix
similarity index 95%
rename from pkgs/servers/misc/qremotecontrol-server/default.nix
rename to pkgs/by-name/qr/qremotecontrol-server/package.nix
index 0c4a5a1c60ef..9b8c48641ec7 100644
--- a/pkgs/servers/misc/qremotecontrol-server/default.nix
+++ b/pkgs/by-name/qr/qremotecontrol-server/package.nix
@@ -2,9 +2,7 @@
   lib,
   stdenv,
   fetchgit,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
+  qt5,
   libxtst,
 }:
 
@@ -23,12 +21,12 @@ stdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    qt5.qmake
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt5.qtbase
     libxtst
   ];
 
diff --git a/pkgs/by-name/ra/rabbit-ng/package.nix b/pkgs/by-name/ra/rabbit-ng/package.nix
new file mode 100644
index 000000000000..0ba2f4794e04
--- /dev/null
+++ b/pkgs/by-name/ra/rabbit-ng/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+}:
+
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "rabbit-ng";
+  version = "3.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "sgl-umons";
+    repo = "RABBIT-ng";
+    tag = finalAttrs.version;
+    hash = "sha256-nd1LMJSJEUMMlKc4N7mQuEcBVJpGdQdZ6thmhk5BfCI=";
+  };
+
+  build-system = with python3Packages; [
+    hatchling
+  ];
+
+  dependencies = with python3Packages; [
+    ghmap
+    numpy
+    onnxruntime
+    pandas
+    python-dotenv
+    requests
+    typer
+  ];
+
+  pythonImportsCheck = [
+    "rabbit_ng"
+  ];
+
+  meta = {
+    description = "RABBIT is a machine-learning based tool designed to identify bot accounts among GitHub contributors";
+    homepage = "https://github.com/sgl-umons/RABBIT-ng";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ drupol ];
+    mainProgram = "rabbit-ng";
+  };
+})
diff --git a/pkgs/by-name/ra/rabbit/package.nix b/pkgs/by-name/ra/rabbit/package.nix
deleted file mode 100644
index 17a4cabcb733..000000000000
--- a/pkgs/by-name/ra/rabbit/package.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-  lib,
-  python3,
-  fetchFromGitHub,
-  fetchPypi,
-}:
-
-let
-  python3' = python3.override {
-    packageOverrides = self: super: {
-      scikit-learn =
-        let
-          version = "1.5.2";
-        in
-        super.scikit-learn.overridePythonAttrs (old: {
-          inherit version;
-
-          src = fetchPypi {
-            pname = "scikit_learn";
-            inherit version;
-            hash = "sha256-tCN+17P90KSIJ5LmjvJUXVuqUKyju0WqffRoE4rY+U0=";
-          };
-
-          # Preserve the postPatch for this scikit-learn version
-          postPatch = ''
-            substituteInPlace meson.build --replace-fail \
-              "run_command('sklearn/_build_utils/version.py', check: true).stdout().strip()," \
-              "'${version}',"
-          '';
-
-          # There are 2 tests that are failing, disabling the tests for now.
-          # - test_csr_polynomial_expansion_index_overflow[csr_array-False-True-2-65535]
-          # - test_csr_polynomial_expansion_index_overflow[csr_array-False-True-3-2344]
-          doCheck = false;
-        });
-    };
-    self = python3;
-  };
-
-  # Make sure to check for which version of scikit-learn this project was built
-  # Currently version 2.3.2 is made with scikit-learn 1.5.2
-  # Upgrading to newer versions of scikit-learn break the project
-  version = "2.3.2";
-in
-python3'.pkgs.buildPythonApplication {
-  pname = "rabbit";
-  inherit version;
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "natarajan-chidambaram";
-    repo = "RABBIT";
-    tag = version;
-    hash = "sha256-icf42vqYPNH1v1wEv/MpqScqMUr/qDlcGoW9kPY2R6s=";
-  };
-
-  pythonRelaxDeps = [
-    "joblib"
-    "numpy"
-    "pandas"
-    "requests"
-    "scikit-learn"
-    "scipy"
-    "tqdm"
-    "urllib3"
-  ];
-
-  build-system = with python3'.pkgs; [
-    setuptools
-  ];
-
-  dependencies = with python3'.pkgs; [
-    joblib
-    numpy
-    pandas
-    python-dateutil
-    requests
-    scikit-learn
-    scipy
-    tqdm
-    urllib3
-  ];
-
-  pythonImportsCheck = [ "rabbit" ];
-
-  meta = {
-    description = "Tool for identifying bot accounts based on their recent GitHub event history";
-    homepage = "https://github.com/natarajan-chidambaram/RABBIT";
-    license = lib.licenses.asl20;
-    mainProgram = "rabbit";
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix
index 5b67d06b8697..6d5cc8e2e568 100644
--- a/pkgs/by-name/ra/rainfrog/package.nix
+++ b/pkgs/by-name/ra/rainfrog/package.nix
@@ -7,7 +7,7 @@
   rainfrog,
 }:
 let
-  version = "0.3.15";
+  version = "0.3.16";
 in
 rustPlatform.buildRustPackage {
   inherit version;
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
     owner = "achristmascarl";
     repo = "rainfrog";
     tag = "v${version}";
-    hash = "sha256-XW2jMiQif0Q9IV8rDw44n/7OTfPkO+XpAb0AVobddDM=";
+    hash = "sha256-Bz1YNR3/RnCZgU4rZWU6ATclkuUamYE3Umja4qXlmXk=";
   };
 
-  cargoHash = "sha256-+B5hPtgXoe3mNiOsarivk8sZ6RS6re3Cw/LO4fzuX9o=";
+  cargoHash = "sha256-qpUUInE0XmyAXWZcqXNyNHy5SDKR+M7DG2YRNlr8rug=";
 
   passthru = {
     tests.version = testers.testVersion {
diff --git a/pkgs/by-name/rc/rclone-ui/package.nix b/pkgs/by-name/rc/rclone-ui/package.nix
index 63ce6f60ee9f..44ccca867e5c 100644
--- a/pkgs/by-name/rc/rclone-ui/package.nix
+++ b/pkgs/by-name/rc/rclone-ui/package.nix
@@ -20,26 +20,26 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rclone-ui";
-  version = "3.4.1";
+  version = "3.4.2";
 
   src = fetchFromGitHub {
     owner = "rclone-ui";
     repo = "rclone-ui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-d4qJtb8eDZ2txeZxGuweK4tuZaq7E7cRNW5wHdNBalY=";
+    hash = "sha256-aDwtRZGs2JhD2xbzVR3wDdSIjWied9BKknt5WETefvU=";
   };
 
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src;
     forceGitDeps = true;
-    hash = "sha256-xnF7c3g3CpMlW3s1UbJHN+R5K+dzV9/IFZ8T/LoT3fk=";
+    hash = "sha256-iyO9Eg+rWV3T50uWyrPHjGcvREnMgSyr0Gq8dxOMPWg=";
   };
 
   cargoRoot = "src-tauri";
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
-  cargoHash = "sha256-lemjmsxZsplfC1/nFn84be0JXuKcub5ORkQLL5HQCHY=";
+  cargoHash = "sha256-sCsH+jjHMR3zsPoFfDq2vVuTc8PvYuR/3ZY5bcW7X0o=";
 
   # Disable tauri bundle updater, can be removed when #389107 is merged
   patches = [ ./remove_updater.patch ];
diff --git a/pkgs/by-name/rc/rclone/package.nix b/pkgs/by-name/rc/rclone/package.nix
index 2ce1e73cf28a..0d8f664268e7 100644
--- a/pkgs/by-name/rc/rclone/package.nix
+++ b/pkgs/by-name/rc/rclone/package.nix
@@ -17,7 +17,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "rclone";
-  version = "1.73.0";
+  version = "1.73.1";
 
   outputs = [
     "out"
@@ -28,10 +28,10 @@ buildGoModule (finalAttrs: {
     owner = "rclone";
     repo = "rclone";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-g/ofD/KsUOXVTOveHKddPN9PP5bx7HWFPct1IhJDZYE=";
+    hash = "sha256-DzyfG14c2ca/Nw8rVL1SJ0fp9CWvus/9jDtwSqYN6F8=";
   };
 
-  vendorHash = "sha256-LomeLlk0d/HTL0NKmbd083u7BHsy4FmAah9IzvmtO2s=";
+  vendorHash = "sha256-mMkntyRAYFrzp0HqlD0FBmzztCMc9gL/Cs/drq8U4K0=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/ri/rinf_cli/package.nix b/pkgs/by-name/ri/rinf_cli/package.nix
index 6c0f887dac0f..05eeec62af8c 100644
--- a/pkgs/by-name/ri/rinf_cli/package.nix
+++ b/pkgs/by-name/ri/rinf_cli/package.nix
@@ -5,17 +5,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rinf_cli";
-  version = "8.9.0";
+  version = "8.9.1";
 
   src = fetchFromGitHub {
     owner = "cunarist";
     repo = "rinf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UHYYpNlhXRYysQlo3EWDUe4Fwp7PMifrQuZcMAGJp6Q=";
+    hash = "sha256-N34Lys5P/3Os2yEl8x1LOJXhcTxp07V8J3B+DMlK3qk=";
   };
   sourceRoot = "${finalAttrs.src.name}/rust_crate_cli";
 
-  cargoHash = "sha256-T1reyeoaGBb+Wyn8WX/u7Kf9B01GwWUcYntb7PlIfCk=";
+  cargoHash = "sha256-vnJloz0wUsJbLbAoiIMNxSUZmibRIF/eLIuqkEXbZp8=";
 
   meta = {
     description = "Framework for creating cross-platform Rust apps leveraging Flutter";
diff --git a/pkgs/by-name/ru/rutabaga_gfx/package.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix
index bbd6c3ef1512..5caaa90d1ed4 100644
--- a/pkgs/by-name/ru/rutabaga_gfx/package.nix
+++ b/pkgs/by-name/ru/rutabaga_gfx/package.nix
@@ -58,8 +58,10 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonBool "gfxstream" withGfxstream)
   ];
 
-  CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
-  "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc.targetPrefix}cc";
+  env = {
+    CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
+    "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc.targetPrefix}cc";
+  };
 
   preConfigure = ''
     cd rutabaga_gfx/ffi
diff --git a/pkgs/by-name/sa/saleae-logic-2/package.nix b/pkgs/by-name/sa/saleae-logic-2/package.nix
index 116ee9e316df..b51a4872b23e 100644
--- a/pkgs/by-name/sa/saleae-logic-2/package.nix
+++ b/pkgs/by-name/sa/saleae-logic-2/package.nix
@@ -31,9 +31,12 @@ appimageTools.wrapType2 {
     ''
       mkdir -p $out/etc/udev/rules.d
       cp ${appimageContents}/resources/linux-x64/99-SaleaeLogic.rules $out/etc/udev/rules.d/
-      mkdir -p $out/share/pixmaps
+      mkdir $out/share
       ln -s ${desktopItem}/share/applications $out/share/
-      cp ${appimageContents}/usr/share/icons/hicolor/256x256/apps/Logic.png $out/share/pixmaps/Logic.png
+      for size in 16 32 48 64 128 256; do
+        install -Dm644 -t $out/share/icons/hicolor/"$size"x"$size"/apps \
+          ${appimageContents}/usr/share/icons/hicolor/"$size"x"$size"/apps/Logic.png
+      done
     '';
 
   extraPkgs =
diff --git a/pkgs/by-name/sa/salt/package.nix b/pkgs/by-name/sa/salt/package.nix
index 9d15aa93d6e8..7597b5f16ef1 100644
--- a/pkgs/by-name/sa/salt/package.nix
+++ b/pkgs/by-name/sa/salt/package.nix
@@ -12,12 +12,12 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "salt";
-  version = "3007.11";
+  version = "3007.13";
   format = "setuptools";
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-EAkO0/1kKSXRkEXNH6mJHznUkQR0AsQ2ijtzCrwUCAU=";
+    hash = "sha256-xmOnOGy9R6/pSm2LCxrx/M3DUFnM7CuTMQ55IHBTRPs=";
   };
 
   patches = [
diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix
index 21404f719f9f..ededdfe45506 100644
--- a/pkgs/by-name/sc/scalingo/package.nix
+++ b/pkgs/by-name/sc/scalingo/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "scalingo";
-  version = "1.43.1";
+  version = "1.43.2";
 
   src = fetchFromGitHub {
     owner = "scalingo";
     repo = "cli";
     rev = version;
-    hash = "sha256-Ny0AlgZAQwnFiu2W3pU1o9J7HVmI2ZjXfWVNmGwLaXI=";
+    hash = "sha256-QyHZrRlbM2V6blk4KtYlyURjM1KjWj/l9X8td7nfHbs=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/sc/scalr-cli/package.nix b/pkgs/by-name/sc/scalr-cli/package.nix
index e0285f8b1e42..adbd58b2a811 100644
--- a/pkgs/by-name/sc/scalr-cli/package.nix
+++ b/pkgs/by-name/sc/scalr-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "scalr-cli";
-  version = "0.17.6";
+  version = "0.17.7";
 
   src = fetchFromGitHub {
     owner = "Scalr";
     repo = "scalr-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-TcgNWtyXadbrE43ZmTLC+d9eXUzgp7zhHxjf2vTsuBk=";
+    hash = "sha256-ZGq76TPMNrlyuHs5yUgw3pJ+a2wVNwBTTSgzIofD4io=";
   };
 
   vendorHash = "sha256-TUf+0Z0yBDOpzMuETn+FCAPXWvQltjRhwQ3Xz0X6YOI=";
diff --git a/pkgs/by-name/sc/scryer-prolog/package.nix b/pkgs/by-name/sc/scryer-prolog/package.nix
index 1fba7059afdd..2c3fe35fa29e 100644
--- a/pkgs/by-name/sc/scryer-prolog/package.nix
+++ b/pkgs/by-name/sc/scryer-prolog/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   buildInputs = [ openssl ];
 
-  CARGO_FEATURE_USE_SYSTEM_LIBS = true;
+  env.CARGO_FEATURE_USE_SYSTEM_LIBS = true;
 
   meta = {
     description = "Modern Prolog implementation written mostly in Rust";
diff --git a/pkgs/by-name/se/seabird/package.nix b/pkgs/by-name/se/seabird/package.nix
index 9e03bbcd7cc1..7fb8b16b1968 100644
--- a/pkgs/by-name/se/seabird/package.nix
+++ b/pkgs/by-name/se/seabird/package.nix
@@ -57,7 +57,7 @@ buildGoModule (finalAttrs: {
   '';
 
   postInstall = ''
-    install -Dm644 internal/icon/seabird.svg $out/share/pixmaps/dev.skynomads.Seabird.svg
+    install -Dm644 internal/icon/seabird.svg $out/share/icons/hicolor/scalable/dev.skynomads.Seabird.svg
   '';
 
   desktopItems = [ "dev.skynomads.Seabird.desktop" ];
diff --git a/pkgs/by-name/sf/sfrotz/package.nix b/pkgs/by-name/sf/sfrotz/package.nix
index 65f2359513ec..83a4b10dfc3c 100644
--- a/pkgs/by-name/sf/sfrotz/package.nix
+++ b/pkgs/by-name/sf/sfrotz/package.nix
@@ -1,72 +1 @@
-{
-  fetchFromGitLab,
-  freetype,
-  libao,
-  libjpeg,
-  libmodplug,
-  libpng,
-  libsamplerate,
-  libsndfile,
-  libvorbis,
-  pkg-config,
-  SDL2,
-  SDL2_mixer,
-  lib,
-  stdenv,
-  zlib,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "sfrotz";
-  version = "2.54";
-
-  src = fetchFromGitLab {
-    domain = "gitlab.com";
-    owner = "DavidGriffith";
-    repo = "frotz";
-    rev = finalAttrs.version;
-    hash = "sha256-GvGxojD8d5GVy/d8h3q6K7KJroz2lsKbfE0F0acjBl8=";
-  };
-
-  buildInputs = [
-    freetype
-    libao
-    libjpeg
-    libmodplug
-    libpng
-    libsamplerate
-    libsndfile
-    libvorbis
-    SDL2
-    SDL2_mixer
-    zlib
-  ];
-  nativeBuildInputs = [ pkg-config ];
-  makeFlags = [ "PREFIX=${placeholder "out"}" ];
-  buildPhase = "make sdl";
-  installTargets = [ "install_sfrotz" ];
-
-  meta = {
-    description = "Interpreter for Infocom and other Z-Machine games (SDL interface)";
-    mainProgram = "sfrotz";
-    longDescription = ''
-      Frotz is a Z-Machine interpreter. The Z-machine is a virtual machine
-      designed by Infocom to run all of their text adventures. It went through
-      multiple revisions during the lifetime of the company, and two further
-      revisions (V7 and V8) were created by Graham Nelson after the company's
-      demise. The specification is now quite well documented; this version of
-      Frotz supports version 1.0.
-
-      This version of Frotz fully supports all these versions of the Z-Machine
-      including the graphical version 6. Graphics and sound are created through
-      the use of the SDL libraries. AIFF sound effects and music in MOD and OGG
-      formats are supported when packaged in Blorb container files or optionally
-      from individual files.
-    '';
-    homepage = "https://davidgriffith.gitlab.io/frotz/";
-    changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${finalAttrs.version}/NEWS";
-    license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ddelabru ];
-    platforms = lib.platforms.linux;
-  };
-})
+{ frotz }: frotz.override { frontend = "sdl"; }
diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/by-name/sh/shairplay/package.nix
similarity index 82%
rename from pkgs/servers/shairplay/default.nix
rename to pkgs/by-name/sh/shairplay/package.nix
index d7eb009476ac..560bf9964fe1 100644
--- a/pkgs/servers/shairplay/default.nix
+++ b/pkgs/by-name/sh/shairplay/package.nix
@@ -4,11 +4,11 @@
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
-  avahi,
+  avahi-compat,
   libao,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "shairplay-unstable";
   version = "2018-08-24";
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    avahi
+    avahi-compat
     libao
   ];
 
@@ -34,16 +34,16 @@ stdenv.mkDerivation rec {
   # the build will fail without complaining about a reference to /tmp
   preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
     patchelf \
-      --set-rpath "${lib.makeLibraryPath buildInputs}:$out/lib" \
+      --set-rpath "${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib" \
       $out/bin/shairplay
   '';
 
   meta = {
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     description = "Apple AirPlay and RAOP protocol server";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ peterhoeg ];
     platforms = lib.platforms.unix;
     mainProgram = "shairplay";
   };
-}
+})
diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix
index a02db407cb4c..5ea17b1edb64 100644
--- a/pkgs/by-name/sh/shipwright/package.nix
+++ b/pkgs/by-name/sh/shipwright/package.nix
@@ -239,7 +239,7 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optionalString stdenv.hostPlatform.isLinux ''
       mkdir -p $out/bin
       ln -s $out/lib/soh.elf $out/bin/soh
-      install -Dm644 ../soh/macosx/sohIcon.png $out/share/pixmaps/soh.png
+      install -Dm644 ../soh/macosx/sohIcon.png $out/share/icons/hicolor/1024x1024/apps/soh.png
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       # Recreate the macOS bundle (without using cpack)
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/by-name/sh/shishi/package.nix
similarity index 64%
rename from pkgs/servers/shishi/default.nix
rename to pkgs/by-name/sh/shishi/package.nix
index 79551bfde1ce..71b3c96b2477 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/by-name/sh/shishi/package.nix
@@ -8,27 +8,23 @@
   libtasn1,
 
   # Optional Dependencies
-  pam ? null,
-  libidn ? null,
-  gnutls ? null,
+  usePam ? lib.meta.availableOn stdenv.hostPlatform pam && stdenv.hostPlatform.isLinux,
+  pam,
+  useLibidn ? lib.meta.availableOn stdenv.hostPlatform libidn,
+  libidn,
+  useGnutls ? lib.meta.availableOn stdenv.hostPlatform gnutls,
+  gnutls,
 }:
 
 let
-  shouldUsePkg =
-    pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null;
-
-  optPam = shouldUsePkg pam;
-  optLibidn = shouldUsePkg libidn;
-  optGnutls = shouldUsePkg gnutls;
-
   inherit (lib) enableFeature withFeature optionalString;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "shishi";
   version = "1.0.3";
 
   src = fetchurl {
-    url = "mirror://gnu/shishi/shishi-${version}.tar.gz";
+    url = "mirror://gnu/shishi/shishi-${finalAttrs.version}.tar.gz";
     hash = "sha256-lXmP/RLdAaT4jgMR7gPKSibly05ekFmkDk/E2fKRfpI=";
   };
 
@@ -39,19 +35,20 @@ stdenv.mkDerivation rec {
     libgcrypt
     libgpg-error
     libtasn1
-    optPam
-    optLibidn
-    optGnutls
+    # TODO use lib.optional instead of setting packages to null
+    (if usePam then pam else null)
+    (if useLibidn then libidn else null)
+    (if useGnutls then gnutls else null)
   ];
 
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
     (enableFeature true "libgcrypt")
-    (enableFeature (optPam != null) "pam")
+    (enableFeature usePam "pam")
     (enableFeature true "ipv6")
-    (withFeature (optLibidn != null) "stringprep")
-    (enableFeature (optGnutls != null) "starttls")
+    (withFeature useLibidn "stringprep")
+    (enableFeature useGnutls "starttls")
     (enableFeature true "des")
     (enableFeature true "3des")
     (enableFeature true "aes")
@@ -70,11 +67,11 @@ stdenv.mkDerivation rec {
   postInstall = ''
     sed -i $out/lib/libshi{sa,shi}.la \
   ''
-  + optionalString (optLibidn != null) ''
-    -e 's,\(-lidn\),-L${optLibidn.out}/lib \1,' \
+  + optionalString useLibidn ''
+    -e 's,\(-lidn\),-L${libidn.out}/lib \1,' \
   ''
-  + optionalString (optGnutls != null) ''
-    -e 's,\(-lgnutls\),-L${optGnutls.out}/lib \1,' \
+  + optionalString useGnutls ''
+    -e 's,\(-lgnutls\),-L${gnutls.out}/lib \1,' \
   ''
   + ''
     -e 's,\(-lgcrypt\),-L${libgcrypt.out}/lib \1,' \
@@ -89,4 +86,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ lovek323 ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/si/sidplayfp/package.nix b/pkgs/by-name/si/sidplayfp/package.nix
index bee6807e5c84..e42ee4771568 100644
--- a/pkgs/by-name/si/sidplayfp/package.nix
+++ b/pkgs/by-name/si/sidplayfp/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sidplayfp";
-  version = "2.16.0";
+  version = "2.16.1";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "sidplayfp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IZFF3ft04+wweknX2iQ+pyuqkogxcVB1aUYiOWLSAVU=";
+    hash = "sha256-W9RuAUlnMMG/ihUxM5wvFDJz0x+6Syk+8ux+dx0Bnw8=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index 6676c5003c6f..40f710c88140 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "signalbackup-tools";
-  version = "20260208";
+  version = "20260217";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     tag = finalAttrs.version;
-    hash = "sha256-rRj8r2uJ6hbvhqzmjOdjBMGj/FlSbnI3tucnCn6oji4=";
+    hash = "sha256-Pd9Hqepm/vxUSKePymi2V6UG8UB3Aj0Jz/UORdYn1J8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/simple-live-app/package.nix b/pkgs/by-name/si/simple-live-app/package.nix
index 608a7ea09772..ebc2cab18324 100644
--- a/pkgs/by-name/si/simple-live-app/package.nix
+++ b/pkgs/by-name/si/simple-live-app/package.nix
@@ -44,7 +44,7 @@ flutter332.buildFlutterApplication rec {
   ];
 
   postInstall = ''
-    install -Dm644 assets/logo.png $out/share/pixmaps/simple-live-app.png
+    install -Dm644 assets/logo.png $out/share/icons/hicolor/1024x1024/apps/simple-live-app.png
   '';
 
   extraWrapProgramArgs = ''
diff --git a/pkgs/by-name/si/simplotask/package.nix b/pkgs/by-name/si/simplotask/package.nix
index acd6c10234b1..5e67109b2471 100644
--- a/pkgs/by-name/si/simplotask/package.nix
+++ b/pkgs/by-name/si/simplotask/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "simplotask";
-  version = "1.19.3";
+  version = "1.20.0";
 
   src = fetchFromGitHub {
     owner = "umputun";
     repo = "spot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XtM9WiLZ8KqaG7oQBADRRz//o60EBFEZl/pgCLQ+adM=";
+    hash = "sha256-iSUT5b0nL+6wiiMXFoXwe9r4WV68BXopCYRrswwFxyk=";
   };
 
   vendorHash = null;
@@ -30,6 +30,7 @@ buildGoModule (finalAttrs: {
   postInstall = ''
     mv $out/bin/{secrets,spot-secrets}
     installManPage *.1
+    installShellCompletion completions/*
   '';
 
   meta = {
diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix
index f34350d17091..62604e8ee377 100644
--- a/pkgs/by-name/si/sioyek/package.nix
+++ b/pkgs/by-name/si/sioyek/package.nix
@@ -15,13 +15,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "sioyek";
-  version = "2.0.0-unstable-2026-02-04";
+  version = "2.0.0-unstable-2026-02-12";
 
   src = fetchFromGitHub {
     owner = "ahrm";
     repo = "sioyek";
-    rev = "bd081b343ec43a702429e934901902ddc51f8b66";
-    hash = "sha256-OmOHIk38s1CVno4LHQegWRZUbMf3KEsOD2VaFCEM55E=";
+    rev = "7b2b26547da4b644d646686a53b087d26ac7413f";
+    hash = "sha256-5ObudXMbUD37LbbtGKW9SDxPHaZx6QBMh+66fyY3NGo=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/si/sirit/package.nix b/pkgs/by-name/si/sirit/package.nix
new file mode 100644
index 000000000000..05d19cf15f18
--- /dev/null
+++ b/pkgs/by-name/si/sirit/package.nix
@@ -0,0 +1,40 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+  spirv-headers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "sirit";
+  version = "1.0.4";
+
+  src = fetchFromGitHub {
+    owner = "eden-emulator";
+    repo = "sirit";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ThyUaoVmnYz9eQ1a19BbLhqfOpPxRjSovBl2wvlfRoI=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+  buildInputs = [ spirv-headers ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "SIRIT_USE_SYSTEM_SPIRV_HEADERS" true)
+  ];
+
+  meta = {
+    description = "Runtime SPIR-V assembler";
+    homepage = "https://github.com/eden-emulator/sirit";
+    license = with lib.licenses; [
+      agpl3Plus
+      gpl3Plus
+    ];
+    maintainers = with lib.maintainers; [ marcin-serwin ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/servers/sks/adapt-to-nixos.patch b/pkgs/by-name/sk/sks/adapt-to-nixos.patch
similarity index 100%
rename from pkgs/servers/sks/adapt-to-nixos.patch
rename to pkgs/by-name/sk/sks/adapt-to-nixos.patch
diff --git a/pkgs/servers/sks/default.nix b/pkgs/by-name/sk/sks/package.nix
similarity index 75%
rename from pkgs/servers/sks/default.nix
rename to pkgs/by-name/sk/sks/package.nix
index 910e3b0fad39..add658800aaa 100644
--- a/pkgs/servers/sks/default.nix
+++ b/pkgs/by-name/sk/sks/package.nix
@@ -2,7 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  ocamlPackages,
+  pkgsHostHost,
+  ocaml-ng,
   perl,
   zlib,
   db,
@@ -10,7 +11,7 @@
 }:
 
 let
-  inherit (ocamlPackages)
+  inherit (ocaml-ng.ocamlPackages_4_12)
     ocaml
     findlib
     cryptokit
@@ -18,7 +19,7 @@ let
     ;
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sks";
   version = "unstable-2021-02-04";
 
@@ -39,11 +40,23 @@ stdenv.mkDerivation rec {
     "webSamples"
   ];
 
-  nativeBuildInputs = [
-    ocaml
-    findlib
-    perl
-  ];
+  nativeBuildInputs =
+    # use static -> static ocaml because dynamic -> static ocaml doesn't compile
+    (
+      if stdenv.hostPlatform.isStatic then
+        [
+          pkgsHostHost.ocaml-ng.ocamlPackages_4_12.ocaml
+          pkgsHostHost.ocaml-ng.ocamlPackages_4_12.findlib
+        ]
+      else
+        [
+          ocaml
+          findlib
+        ]
+    )
+    ++ [
+      perl
+    ];
   buildInputs = [
     zlib
     db
@@ -81,9 +94,9 @@ stdenv.mkDerivation rec {
       servers, and even wildly out-of-date servers, or servers that experience
       spotty connectivity, can fully synchronize with rest of the system.
     '';
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix
index 9253ab78d42f..61974e2758e8 100644
--- a/pkgs/by-name/sn/snx-rs/package.nix
+++ b/pkgs/by-name/sn/snx-rs/package.nix
@@ -15,13 +15,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "snx-rs";
-  version = "5.0.5";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "ancwrd1";
     repo = "snx-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M0F5mJAVPWjT00jmgRC5rlWlN5Q5G5B63DETwJz0TfU=";
+    hash = "sha256-whmZM6OYdHtcTJzzR4aqDMBVpFuRvJKLFVGCQNDjRw8=";
   };
 
   passthru.updateScript = nix-update-script { };
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
 
-  cargoHash = "sha256-zOKXs4bw1JF2uZN0qvID2lYtH4/d5hOihENFSeq9oe8=";
+  cargoHash = "sha256-gAOxwmsPo0XpFxNe3EObNlgiTJ0krMAlVaTDorrYUqg=";
 
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/snx-rs";
diff --git a/pkgs/by-name/so/socalabs-papu/package.nix b/pkgs/by-name/so/socalabs-papu/package.nix
index b65f96418d21..62f974c1390d 100644
--- a/pkgs/by-name/so/socalabs-papu/package.nix
+++ b/pkgs/by-name/so/socalabs-papu/package.nix
@@ -7,6 +7,7 @@
   alsa-lib,
   copyDesktopItems,
   makeDesktopItem,
+  imagemagick,
   libx11,
   libxcomposite,
   libxcursor,
@@ -60,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     pkg-config
     copyDesktopItems
+    imagemagick
     ninja
   ];
 
@@ -113,7 +115,8 @@ stdenv.mkDerivation (finalAttrs: {
 
     install -Dm555 PAPU_artefacts/Release/Standalone/PAPU $out/bin
 
-    install -Dm444 $src/plugin/Resources/icon.png $out/share/pixmaps/PAPU.png
+    mkdir -p $out/share/icons/hicolor/256x256/apps
+    magick $src/plugin/Resources/icon.png -resize 256x256 $out/share/icons/hicolor/256x256/apps/PAPU.png
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/so/socalabs-sid/package.nix b/pkgs/by-name/so/socalabs-sid/package.nix
index 792b529a75b4..b25ab3d9cf24 100644
--- a/pkgs/by-name/so/socalabs-sid/package.nix
+++ b/pkgs/by-name/so/socalabs-sid/package.nix
@@ -7,6 +7,7 @@
   alsa-lib,
   copyDesktopItems,
   makeDesktopItem,
+  imagemagick,
   libxtst,
   libxrandr,
   libxinerama,
@@ -73,6 +74,7 @@ stdenv.mkDerivation {
     cmake
     pkg-config
     copyDesktopItems
+    imagemagick
     ninja
   ];
 
@@ -147,7 +149,8 @@ stdenv.mkDerivation {
 
     install -Dm755 SID_artefacts/Release/Standalone/SID $out/bin
 
-    install -Dm444 $src/plugin/Resources/icon.png $out/share/pixmaps/SID.png
+    mkdir -p $out/share/icons/hicolor/256x256/apps
+    magick $src/plugin/Resources/icon.png -resize 256x256 $out/share/icons/hicolor/256x256/apps/SID.png
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/so/sonobus/package.nix b/pkgs/by-name/so/sonobus/package.nix
index 89c44f0326da..7ad0b14b6e66 100644
--- a/pkgs/by-name/so/sonobus/package.nix
+++ b/pkgs/by-name/so/sonobus/package.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
     cd ../linux
     ./install.sh "$out"
 
-    install -Dm444 $src/images/sonobus_logo_96.png $out/share/pixmaps/sonobus.png
+    install -Dm444 $src/images/sonobus_logo_96.png $out/share/icons/hicolor/96x96/apps/sonobus.png
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/sp/spaghettikart/package.nix b/pkgs/by-name/sp/spaghettikart/package.nix
index 409e1758a667..b65b5372f7f5 100644
--- a/pkgs/by-name/sp/spaghettikart/package.nix
+++ b/pkgs/by-name/sp/spaghettikart/package.nix
@@ -252,7 +252,7 @@ stdenv.mkDerivation (finalAttrs: {
     cp -r ../yamls $out/share/spaghettikart/
     cp -r ../meta $out/share/spaghettikart/
     install -Dm644 -t $out/share/spaghettikart {spaghetti.o2r,config.yml,gamecontrollerdb.txt}
-    install -Dm644 ../icon.png $out/share/pixmaps/spaghettikart.png
+    install -Dm644 ../icon.png $out/share/icons/hicolor/256x256/apps/spaghettikart.png
     install -Dm644 -t $out/share/licenses/spaghettikart/libgfxd ${libgfxd}/LICENSE
     install -Dm644 -t $out/share/licenses/spaghettikart/libultraship ../libultraship/LICENSE
     install -Dm644 -t $out/share/licenses/spaghettikart/thread_pool ${thread_pool}/LICENSE.txt
diff --git a/pkgs/by-name/sq/sqlcl/package.nix b/pkgs/by-name/sq/sqlcl/package.nix
index 6a0b3aebb078..5d4019cfd3b6 100644
--- a/pkgs/by-name/sq/sqlcl/package.nix
+++ b/pkgs/by-name/sq/sqlcl/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sqlcl";
-  version = "25.4.1.022.0618";
+  version = "25.4.2.044.1837";
 
   src = fetchurl {
     url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip";
-    hash = "sha256-txfYOqGnraLKOOfIvls2nqai+fUMX9tV4Y0mO0ceyrk=";
+    hash = "sha256-VHLCJZWSGEJVih1hyCLmv94YoWgEPNdKoVvHDCgDpQw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/st/stoat-desktop/package.nix b/pkgs/by-name/st/stoat-desktop/package.nix
index 7fafd0cf3132..2d4a06437c51 100644
--- a/pkgs/by-name/st/stoat-desktop/package.nix
+++ b/pkgs/by-name/st/stoat-desktop/package.nix
@@ -1,72 +1,136 @@
 {
-  stdenvNoCC,
   lib,
-  asar,
-  fetchurl,
-  fetchzip,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchPnpmDeps,
   makeDesktopItem,
-  copyDesktopItems,
+  desktopToDarwinBundle,
+  pnpmConfigHook,
   makeWrapper,
-  electron,
+  removeReferencesTo,
+  copyDesktopItems,
+  pnpm_10,
+  nodejs,
+  electron_38,
+  zip,
 }:
-
-stdenvNoCC.mkDerivation rec {
+let
+  electron = electron_38;
+  stdenv = stdenvNoCC;
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "stoat-desktop";
-  version = "1.1.12";
+  version = "1.2.0";
 
-  src = fetchzip {
-    url = "https://github.com/stoatchat/for-desktop/releases/download/v${version}/Stoat-linux-x64-${version}.zip";
-    hash = "sha256-S3uJ4ADzDgrpKVxBdEpz73Q6bqOakzk9bObaoRZopbM=";
-    stripRoot = false;
+  src = fetchFromGitHub {
+    owner = "stoatchat";
+    repo = "for-desktop";
+    tag = "v${finalAttrs.version}";
+    fetchSubmodules = true;
+    hash = "sha256-Q1FKQBxtlrGmdfx7gLd0aQx/5Pqd4atFdMykxK997Rw=";
   };
 
-  dontConfigure = true;
-  dontBuild = true;
+  postPatch = ''
+    # Disable auto-updates
+    substituteInPlace src/main.ts \
+      --replace-fail "updateElectronApp();" ""
+  '';
+
+  strictDeps = true;
+  __structuredAttrs = true;
+  doCheck = true;
 
   nativeBuildInputs = [
-    copyDesktopItems
+    pnpmConfigHook
+    removeReferencesTo
     makeWrapper
-    asar
+    copyDesktopItems
+    nodejs
+    pnpm_10
+    zip
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
   ];
 
-  installPhase = ''
-    runHook preInstall
-    set -euo pipefail
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    fetcherVersion = 3;
+    pnpm = pnpm_10;
+    hash = "sha256-m0EuM8qTCFLxxO0RNze5WgMkuHZXeIi+U/Jiuv91eCg=";
+  };
 
-    mkdir -p "$out/bin" "$out/share/applications" "$out/share/stoat-desktop"
+  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
-    asarPath="$(find "$src" -type f -path '*/resources/app.asar' -print -quit || true)"
-    if [ -z "$asarPath" ]; then
-      echo "ERROR: could not find resources/app.asar in $src" >&2
-      exit 1
-    fi
+  buildPhase = ''
+    runHook preBuild
 
-    resDir="$(dirname "$asarPath")"
-    appDir="$(dirname "$resDir")"
+    export npm_config_nodedir=${electron.headers}
 
-    cp -a "$resDir" "$out/share/stoat-desktop/resources"
-    if [ -d "$appDir/locales" ]; then
-      cp -a "$appDir/locales" "$out/share/stoat-desktop/locales"
-    fi
+    # override the detected electron version
+    substituteInPlace node_modules/@electron-forge/core-utils/dist/electron-version.js \
+      --replace-fail "return version" "return '${electron.version}'"
 
-    mkdir -p "$out/share/icons/hicolor/scalable/apps"
-    install -m644 ${
-      fetchurl {
-        url = "https://raw.githubusercontent.com/stoatchat/assets/628eb2f8255c215148007f4227d2e0d5d1a67582/desktop/icon.svg";
-        hash = "sha256-EMDwnAtfTZqhw8hMGTbMjZUrnVkP+2HkyHlSy6pZmik=";
-      }
-    } "$out/share/icons/hicolor/scalable/apps/stoat-desktop.svg"
+    # create the electron archive to be used by electron-packager
+    cp -r ${electron.dist} electron-dist
+    chmod -R u+w electron-dist
 
-    runHook postInstall
+    pushd electron-dist
+    zip -0Xqr ../electron.zip .
+    popd
+
+    rm -r electron-dist
+
+    # force @electron/packager to use our electron instead of downloading it
+    substituteInPlace node_modules/@electron/packager/dist/packager.js \
+      --replace-fail "await this.getElectronZipPath(downloadOpts)" "'$(pwd)/electron.zip'"
+
+
+    pnpm make \
+      --arch "${stdenv.hostPlatform.node.arch}" \
+      --platform "${stdenv.hostPlatform.node.platform}" \
+      --targets "@electron-forge/maker-zip"
+
+    runHook postBuild
   '';
 
+  installPhase = lib.concatStringsSep "\n" [
+    "runHook preInstall"
+    # Make freedesktop stuff, then the convert hook should make them for Darwin
+    ''
+      install -Dm444 "assets/desktop/icon.svg" "$out/share/icons/hicolor/scalable/apps/stoat-desktop.svg"
+    ''
+    (lib.optionalString stdenv.hostPlatform.isLinux ''
+      # remove references to nodejs
+      find out/*/resources/app/node_modules -type f -executable -exec remove-references-to -t ${nodejs} '{}' \;
+
+      mkdir -p "$out/share/stoat-desktop"
+      cp -r out/*/resources{,.pak} "$out/share/stoat-desktop"
+
+      makeWrapper ${lib.getExe electron} "$out/bin/stoat-desktop" \
+        --add-flag $out/share/stoat-desktop/resources/app.asar \
+        --set ELECTRON_FORCE_IS_PACKAGED 1 \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+        --inherit-argv0
+    '')
+    (lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p "$out/Applications"
+      cp -r out/*/Stoat.app
+
+      makeWrapper "$out/Applications/Stoat.app/Contents/MacOS/stoat-desktop" "$out/bin/stoat-desktop" \
+        --set ELECTRON_FORCE_IS_PACKAGED 1 \
+        --inherit-argv0
+    '')
+    "runHook postInstall"
+  ];
+
   desktopItems = [
     (makeDesktopItem {
       name = "Stoat";
-      exec = "stoat-desktop %u";
-      icon = "stoat-desktop";
+      exec = "${finalAttrs.meta.mainProgram} %u";
+      icon = "${finalAttrs.meta.mainProgram}";
       desktopName = "Stoat";
-      genericName = meta.description;
+      genericName = "Chat Client";
       categories = [
         "Network"
         "Chat"
@@ -76,24 +140,18 @@ stdenvNoCC.mkDerivation rec {
     })
   ];
 
-  postFixup = ''
-    makeWrapper ${electron}/bin/electron "$out/bin/stoat-desktop" \
-      --add-flags "$out/share/stoat-desktop/resources/app.asar" \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
-  '';
-
   meta = {
     description = "Open source user-first chat platform";
     homepage = "https://stoat.chat/";
-    changelog = "https://github.com/stoatchat/for-desktop/releases/tag/v${version}";
+    changelog = "https://github.com/stoatchat/for-desktop/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [
       heyimnova
       magistau
       v3rm1n0
+      RossSmyth
     ];
-    platforms = lib.platforms.linux;
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    platforms = with lib.platforms; linux ++ darwin;
     mainProgram = "stoat-desktop";
   };
-}
+})
diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix
index 91c1c8be8a66..9fd8a307bcac 100644
--- a/pkgs/by-name/sy/sydbox/package.nix
+++ b/pkgs/by-name/sy/sydbox/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sydbox";
-  version = "3.48.7";
+  version = "3.49.1";
 
   outputs = [
     "out"
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Sydbox";
     repo = "sydbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oNA0/1X0av/pd7e6lxDWidNdc+nu7fIclNwkH85Vdag=";
+    hash = "sha256-TFPN0KvzO+tNlt9EWEx7MC3DNC3+CzHJn2MfMWpwOp4=";
   };
 
-  cargoHash = "sha256-U8Q1OGHfM4o7QYSh7e0yuB7RdIN02z21ZnHfCMfrL74=";
+  cargoHash = "sha256-yrsJrZ4rDBYlapz/O+1l4h6MIAgZ0PpYm68OFfeHb8A=";
 
   nativeBuildInputs = [
     mandoc
diff --git a/pkgs/by-name/sy/systemd-manager-tui/package.nix b/pkgs/by-name/sy/systemd-manager-tui/package.nix
index 97b94ad871dd..041348f7afe0 100644
--- a/pkgs/by-name/sy/systemd-manager-tui/package.nix
+++ b/pkgs/by-name/sy/systemd-manager-tui/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "systemd-manager-tui";
-  version = "1.2.0";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "Matheus-git";
     repo = "systemd-manager-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/KtvQBye5Z7xfCO57YhM/s+XOAT4ZIBU6Ycu398haXw=";
+    hash = "sha256-hPsHsa4eY7kOxKj9YiDK3uQyVOp2/JcR53ygFZXrkO4=";
   };
 
-  cargoHash = "sha256-g6ES+A73E6k/TPw73azeYXj5R91Y98Im1enYKDqKTVk=";
+  cargoHash = "sha256-/8QN/QU6Ayx8FAI4bwaWqOoL9fYIT5m65908zXpm3gk=";
 
   meta = {
     homepage = "https://github.com/Matheus-git/systemd-manager-tui";
diff --git a/pkgs/servers/tang/default.nix b/pkgs/by-name/ta/tang/package.nix
similarity index 88%
rename from pkgs/servers/tang/default.nix
rename to pkgs/by-name/ta/tang/package.nix
index 76b95aa942e8..97deec22126b 100644
--- a/pkgs/servers/tang/default.nix
+++ b/pkgs/by-name/ta/tang/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  asciidoc,
+  asciidoc-full,
   jansson,
   jose,
   http-parser,
@@ -17,19 +17,19 @@
   nixosTests,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tang";
   version = "15";
 
   src = fetchFromGitHub {
     owner = "latchset";
     repo = "tang";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-nlC2hdNzQZrfirjS2gX4oFp2OD1OdxmLsN03hfxD3ug=";
   };
 
   nativeBuildInputs = [
-    asciidoc
+    asciidoc-full
     meson
     ninja
     pkg-config
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
       version = testers.testVersion {
         package = tang;
         command = "${tang}/libexec/tangd --version";
-        version = "tangd ${version}";
+        version = "tangd ${finalAttrs.version}";
       };
     };
     updateScript = gitUpdater { };
@@ -69,9 +69,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Server for binding data to network presence";
     homepage = "https://github.com/latchset/tang";
-    changelog = "https://github.com/latchset/tang/releases/tag/v${version}";
+    changelog = "https://github.com/latchset/tang/releases/tag/v${finalAttrs.version}";
     maintainers = with lib.maintainers; [ fpletz ];
     license = lib.licenses.gpl3Plus;
     mainProgram = "tangd";
   };
-}
+})
diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/by-name/ta/tautulli/package.nix
similarity index 83%
rename from pkgs/servers/tautulli/default.nix
rename to pkgs/by-name/ta/tautulli/package.nix
index 4154d066d06a..55785b012d11 100644
--- a/pkgs/servers/tautulli/default.nix
+++ b/pkgs/by-name/ta/tautulli/package.nix
@@ -1,27 +1,25 @@
 {
   lib,
   fetchFromGitHub,
-  buildPythonApplication,
-  setuptools,
-  wrapPython,
+  python3Packages,
   makeWrapper,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "Tautulli";
   version = "2.16.1";
   pyproject = false;
 
-  pythonPath = [ setuptools ];
+  pythonPath = [ python3Packages.setuptools ];
   nativeBuildInputs = [
-    wrapPython
+    python3Packages.wrapPython
     makeWrapper
   ];
 
   src = fetchFromGitHub {
     owner = "Tautulli";
     repo = "Tautulli";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-Zct7EhnU5LROO23Joz6OxQTtC9uGZhtceSG+aX6MI2c=";
   };
 
@@ -32,7 +30,7 @@ buildPythonApplication rec {
     cp -R contrib data lib plexpy Tautulli.py CHANGELOG.md $out/libexec/tautulli
 
     echo "master" > $out/libexec/tautulli/branch.txt
-    echo "v${version}" > $out/libexec/tautulli/version.txt
+    echo "v${finalAttrs.version}" > $out/libexec/tautulli/version.txt
 
     # Can't just symlink to the main script, since it uses __file__ to
     # import bundled packages and manage the service
@@ -60,4 +58,4 @@ buildPythonApplication rec {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ rhoriguchi ];
   };
-}
+})
diff --git a/pkgs/by-name/te/teeworlds/package.nix b/pkgs/by-name/te/teeworlds/package.nix
index 4f69c4f9f014..6808477dbf63 100644
--- a/pkgs/by-name/te/teeworlds/package.nix
+++ b/pkgs/by-name/te/teeworlds/package.nix
@@ -101,8 +101,8 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall = lib.optionalString buildClient (
     lib.optionalString stdenv.hostPlatform.isLinux ''
       # Convert and install desktop icon
-      mkdir -p $out/share/pixmaps
-      icotool --extract --index 1 --output $out/share/pixmaps/teeworlds.png $src/other/icons/teeworlds.ico
+      mkdir -p $out/share/icons/hicolor/256x256/apps
+      icotool --extract --index 1 --output $out/share/icons/hicolor/256x256/apps/teeworlds.png $src/other/icons/teeworlds.ico
 
       # Install menu item
       install -D $src/other/teeworlds.desktop $out/share/applications/teeworlds.desktop
diff --git a/pkgs/by-name/te/termius/package.nix b/pkgs/by-name/te/termius/package.nix
index 3986fca47b99..185ef5e7660c 100644
--- a/pkgs/by-name/te/termius/package.nix
+++ b/pkgs/by-name/te/termius/package.nix
@@ -73,9 +73,9 @@ stdenv.mkDerivation rec {
     mkdir -p $out/opt/termius
     cp -r ./ $out/opt/termius
 
-    mkdir -p "$out/share/applications" "$out/share/pixmaps"
+    mkdir -p $out/share/applications
     cp "${desktopItem}/share/applications/"* "$out/share/applications"
-    cp meta/gui/icon.png $out/share/pixmaps/termius-app.png
+    install -Dm644 meta/gui/icon.png $out/share/icons/hicolor/1024x1024/termius-app.png
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/th/threema-desktop/package.nix b/pkgs/by-name/th/threema-desktop/package.nix
index b8862855da58..9045cf2ef85a 100644
--- a/pkgs/by-name/th/threema-desktop/package.nix
+++ b/pkgs/by-name/th/threema-desktop/package.nix
@@ -111,8 +111,7 @@ buildNpmPackage rec {
       ln -s $out/opt/threema/$dir $out/opt/threema/dist/src/$dir
     done
 
-    mkdir -p $out/share/pixmaps
-    cp $out/opt/threema/assets/icons/svg/consumer.svg $out/share/pixmaps/threema.svg
+    install -Dm644 $out/opt/threema/assets/icons/svg/consumer.svg $out/share/icons/hicolor/scalable/threema.svg
 
     makeWrapper ${electron}/bin/electron $out/bin/threema \
       --add-flags $out/opt/threema/dist/src/main.js
diff --git a/pkgs/by-name/ti/tiny-rdm/package.nix b/pkgs/by-name/ti/tiny-rdm/package.nix
index 19b2a16717f8..8079762886d8 100644
--- a/pkgs/by-name/ti/tiny-rdm/package.nix
+++ b/pkgs/by-name/ti/tiny-rdm/package.nix
@@ -3,6 +3,7 @@
   buildGoModule,
   fetchFromGitHub,
   fetchNpmDeps,
+  imagemagick,
   npmHooks,
   nodejs,
   wails,
@@ -48,6 +49,7 @@ buildGoModule (finalAttrs: {
     nodejs
     npmHooks.npmConfigHook
     copyDesktopItems
+    imagemagick
   ];
 
   buildInputs = [ webkitgtk_4_1 ];
@@ -79,7 +81,8 @@ buildGoModule (finalAttrs: {
     runHook preInstall
 
     install -Dm 0755 build/bin/tiny-rdm $out/bin/tiny-rdm
-    install -Dm 0644 frontend/src/assets/images/icon.png $out/share/pixmaps/tiny-rdm.png
+    mkdir -p $out/share/icons/hicolor/96x96/apps
+    magick frontend/src/assets/images/icon.png -resize 96x96 $out/share/icons/hicolor/96x96/apps/tiny-rdm.png
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/to/todoist-electron/package.nix b/pkgs/by-name/to/todoist-electron/package.nix
index 9edcaebe2efe..f0fd3a508b8a 100644
--- a/pkgs/by-name/to/todoist-electron/package.nix
+++ b/pkgs/by-name/to/todoist-electron/package.nix
@@ -37,7 +37,7 @@ appimageTools.wrapAppImage {
   # Add desktop convencience stuff
   extraInstallCommands = ''
     install -D --mode 0644 ${appimageContents}/todoist.desktop -t $out/share/applications
-    install -D --mode 0644 ${appimageContents}/todoist.png -t $out/share/pixmaps
+    install -D --mode 0644 ${appimageContents}/todoist.png -t $out/share/icons/hicolor/512x512/apps
     substituteInPlace $out/share/applications/todoist.desktop \
       --replace-fail "Exec=AppRun" "Exec=todoist-electron --" \
       --replace-fail "Exec=todoist" "Exec=todoist-electron --"
diff --git a/pkgs/by-name/to/todoman/package.nix b/pkgs/by-name/to/todoman/package.nix
index f16c5ea01aac..3abcd2678439 100644
--- a/pkgs/by-name/to/todoman/package.nix
+++ b/pkgs/by-name/to/todoman/package.nix
@@ -90,8 +90,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     "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/tokstat/package.nix b/pkgs/by-name/to/tokstat/package.nix
new file mode 100644
index 000000000000..4b6911afb78a
--- /dev/null
+++ b/pkgs/by-name/to/tokstat/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  installShellFiles,
+  openssl,
+  dbus,
+  stdenv,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "tokstat";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "pbek";
+    repo = "tokstat";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-J144les0gxAFt34+r2hcikIyLKm+A1p8zNg+FljZ41o=";
+  };
+
+  cargoHash = "sha256-llS2UrJ9B+JSNkBUYioEEbe36lGgIr3ifjBXgPhTRnE=";
+
+  nativeBuildInputs = [
+    pkg-config
+    installShellFiles
+  ];
+
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    dbus
+  ];
+
+  # For keyring support
+  PKG_CONFIG_PATH = lib.optionalString stdenv.hostPlatform.isLinux "${dbus.dev}/lib/pkgconfig";
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    # Generate shell completions
+    installShellCompletion --cmd tokstat \
+      --bash <($out/bin/tokstat --generate bash 2>/dev/null) \
+      --fish <($out/bin/tokstat --generate fish 2>/dev/null) \
+      --zsh <($out/bin/tokstat --generate zsh 2>/dev/null)
+  '';
+
+  meta = {
+    description = "CLI application to monitor token quotas across multiple AI providers";
+    homepage = "https://github.com/pbek/tokstat";
+    changelog = "https://github.com/pbek/tokstat/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ pbek ];
+    mainProgram = "tokstat";
+  };
+})
diff --git a/pkgs/by-name/to/torcs/package.nix b/pkgs/by-name/to/torcs/package.nix
index e35e35932e0b..9ab747770b84 100644
--- a/pkgs/by-name/to/torcs/package.nix
+++ b/pkgs/by-name/to/torcs/package.nix
@@ -1,4 +1,5 @@
 {
+  imagemagick,
   stdenv,
   symlinkJoin,
   torcs-without-data,
@@ -20,7 +21,11 @@ let
 
     installTargets = "export datainstall";
     postInstall = ''
-      install -D -m644 Ticon.png $out/share/pixmaps/torcs.png
+      mkdir -p $out/share/icons/hicolor/64x64/apps
+      ${imagemagick}/bin/magick Ticon.png -resize 64x64 $out/share/icons/hicolor/64x64/apps/torcs.png
+
+      substituteInPlace torcs.desktop \
+        --replace-fail "Icon=torcs.png" "Icon=torcs"
       install -D -m644 torcs.desktop $out/share/applications/torcs.desktop
     '';
 
diff --git a/pkgs/by-name/to/tortoisehg/package.nix b/pkgs/by-name/to/tortoisehg/package.nix
index e44d4d6fdda8..23781b426af6 100644
--- a/pkgs/by-name/to/tortoisehg/package.nix
+++ b/pkgs/by-name/to/tortoisehg/package.nix
@@ -76,7 +76,6 @@ python3Packages.buildPythonApplication {
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
-      danbst
       gbtb
     ];
   };
diff --git a/pkgs/by-name/tr/transito/package.nix b/pkgs/by-name/tr/transito/package.nix
index 1d546087b41e..db5d3856d771 100644
--- a/pkgs/by-name/tr/transito/package.nix
+++ b/pkgs/by-name/tr/transito/package.nix
@@ -45,11 +45,9 @@ buildGoModule (finalAttrs: {
 
   postInstall = ''
     install -Dm644 -t $out/share/applications assets/transito.desktop
-    install -Dm644 -t $out/share/pixmaps assets/transito.png
-    for icon in assets/transito_*.png
-    do
+    for icon in assets/transito_*.png; do
       name=$(basename $icon .png)
-      install -Dm644 -t $out/share/icons/hicolor/''${name#transito_}/apps $icon
+      install -Dm644 $icon $out/share/icons/hicolor/''${name#transito_}/apps/transito.png
     done
   '';
 
diff --git a/pkgs/by-name/tr/trigger/package.nix b/pkgs/by-name/tr/trigger/package.nix
index 8ea93fcdd54e..25d93bfef1fb 100644
--- a/pkgs/by-name/tr/trigger/package.nix
+++ b/pkgs/by-name/tr/trigger/package.nix
@@ -64,8 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     EOF
     chmod +x $out/bin/trigger-rally
 
-    mkdir -p $out/share/pixmaps/
-    ln -s $out/share/games/trigger-rally/icon/trigger-rally-icons.svg $out/share/pixmaps/trigger.svg
+    install -Dm644 $out/share/games/trigger-rally/icon/trigger-rally-icons.svg $out/share/icons/hicolor/scalable/trigger.svg
   '';
 
   desktopItems = [
diff --git a/pkgs/by-name/tw/twilio-cli/package.nix b/pkgs/by-name/tw/twilio-cli/package.nix
index ba0ebb5cd323..c9b0f08576ac 100644
--- a/pkgs/by-name/tw/twilio-cli/package.nix
+++ b/pkgs/by-name/tw/twilio-cli/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "twilio-cli";
-  version = "6.2.3";
+  version = "6.2.4";
 
   src = fetchzip {
     url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";
-    hash = "sha256-a5eTxtcC3cGZ+8MMMfE9UKrxAQ7pfivWMss4NMKbf9s=";
+    hash = "sha256-ty5KBMXOo8MHF++xTFDC5IK+zAhXKEJ4XRAF/HHjkX0=";
   };
 
   buildInputs = [ nodejs-slim ];
diff --git a/pkgs/by-name/un/unpoller/package.nix b/pkgs/by-name/un/unpoller/package.nix
index c020617af2ad..22e23deead1f 100644
--- a/pkgs/by-name/un/unpoller/package.nix
+++ b/pkgs/by-name/un/unpoller/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "unpoller";
-  version = "2.33.0";
+  version = "2.34.0";
 
   src = fetchFromGitHub {
     owner = "unpoller";
     repo = "unpoller";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-RPhM1oAQhwyNr4CjtxhrhVxw5NfO0lzOq3kx2OqzlwY=";
+    hash = "sha256-zsWPXO0JgzMJwCvpWA/UzyXyrNJL2wFDstrVKeAZvPo=";
   };
 
-  vendorHash = "sha256-Z7Wb4nQMPr3og0wWWJp3jU8lTR6hhxMz7XENkanIgQg=";
+  vendorHash = "sha256-yh2ErDf3YMvA+y52LfdB8u+uR/tW29h35UGB9r5bh8E=";
 
   ldflags = [
     "-w"
diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 2403de4fca48..68045d93623f 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.10.2";
+  version = "0.10.4";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-7huzemS9BLCOmfzr2cSd8Tc4PtTJV0peYQ5FN2VaPKw=";
+    hash = "sha256-+6u8rmTLwZlEvbnF7Ng/06uYcs6HJGAEyOhEwzYVHVE=";
   };
 
-  cargoHash = "sha256-kSpRcliQpCCjpZUSCwd9THszOSmdXDIooJA4ZPtRjvo=";
+  cargoHash = "sha256-jpaOD98n0FBnYzexDiLhtHLRLmzSOZN38KKzcc+o5WQ=";
 
   buildInputs = [
     rust-jemalloc-sys
diff --git a/pkgs/by-name/vo/voxinput/package.nix b/pkgs/by-name/vo/voxinput/package.nix
index 02f324c509fe..c8c74a36c71c 100644
--- a/pkgs/by-name/vo/voxinput/package.nix
+++ b/pkgs/by-name/vo/voxinput/package.nix
@@ -22,16 +22,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "voxinput";
-  version = "0.9.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "richiejp";
     repo = "VoxInput";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0fdzL8J84XNpriuIUfMUzYpopyDqNMwCYAlzw68pMN4=";
+    hash = "sha256-Zb3tz8YuS2VJWXbr8+yBuL89vlDXadFowSzWuZ5a0WI=";
   };
 
-  vendorHash = "sha256-Ngb5fXHeQLDhCFHICH7Uj57GOQcMPxF2eIJaDIhl7S0=";
+  vendorHash = "sha256-NMuHvhN1A6TQ18Z1H8k8Sy7Py9744Xv95MZz0QvExQY=";
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix
index 37ed34f5bf70..124a474ab3ab 100644
--- a/pkgs/by-name/wa/wasm-tools/package.nix
+++ b/pkgs/by-name/wa/wasm-tools/package.nix
@@ -6,20 +6,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wasm-tools";
-  version = "1.245.0";
+  version = "1.245.1";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasm-tools";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hGWKDy84Ok7uwzuMA2lg+Osd9JomMUXqInVSl4j+C94=";
+    hash = "sha256-0x3RcGd8OB/XNvKnHihvc0DOnCqB3gxTQAxLK7HIWMI=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
 
-  cargoHash = "sha256-K7b6Ine3/reAjQc6WwWXWHK2gR74u8MaY4rE0jDjFVs=";
+  cargoHash = "sha256-5CIKmfa/hqR1Ge7reiTzyx0D4JMjBsxg2xqxzzZxl4s=";
   cargoBuildFlags = [
     "--package"
     "wasm-tools"
diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix
index 99dc623a9753..664e45982fba 100644
--- a/pkgs/by-name/we/weasis/package.nix
+++ b/pkgs/by-name/we/weasis/package.nix
@@ -81,10 +81,10 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preInstall
   ''
   + lib.optionalString stdenv.isLinux ''
-    mkdir -p $out/{bin,opt/Weasis,share/{applications,pixmaps}}
+    mkdir -p $out/{bin,opt/Weasis,share/{applications,icons/hicolor/64x64/apps}}
 
     mv weasis-${platform}-jdk${lib.versions.major jdk25.version}-${finalAttrs.version}/Weasis/* $out/opt/Weasis
-    mv $out/opt/Weasis/lib/*.png $out/share/pixmaps/
+    mv $out/opt/Weasis/lib/*.png $out/share/icons/hicolor/64x64/apps
 
     for bin in $out/opt/Weasis/bin/*; do
       makeWrapper $bin $out/bin/$(basename $bin) \
diff --git a/pkgs/by-name/wh/whatsapp-electron/package.nix b/pkgs/by-name/wh/whatsapp-electron/package.nix
index 53bf250488d3..d06527c789ba 100644
--- a/pkgs/by-name/wh/whatsapp-electron/package.nix
+++ b/pkgs/by-name/wh/whatsapp-electron/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p "$out/share/whatsapp-electron"
     cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/whatsapp-electron"
 
-    install -D assets/whatsapp-icon-512x512.png $out/share/pixmaps/whatsapp.png
+    install -D assets/whatsapp-icon-512x512.png $out/share/icons/hicolor/512x512/apps/whatsapp.png
     install -D assets/whatsapp-icon-512x512.svg $out/share/icons/hicolor/scalable/apps/whatsapp.svg
     runHook postInstall
   '';
diff --git a/pkgs/by-name/wi/windsend-rs/package.nix b/pkgs/by-name/wi/windsend-rs/package.nix
index b8ff0967ad3a..a6698fd64774 100644
--- a/pkgs/by-name/wi/windsend-rs/package.nix
+++ b/pkgs/by-name/wi/windsend-rs/package.nix
@@ -11,6 +11,7 @@
   xdotool,
   makeDesktopItem,
   libayatana-appindicator,
+  imagemagick,
   nix-update-script,
 }:
 
@@ -32,6 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeBuildInputs = [
     copyDesktopItems
     pkg-config
+    imagemagick
   ];
 
   buildInputs = [
@@ -52,7 +54,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   postInstall = ''
-    install -Dm644 icon-192.png $out/share/pixmaps/windsend-rs.png
+    mkdir -p $out/share/icons/hicolor/128x128/apps
+    magick icon-192.png -resize 128x128 $out/share/icons/hicolor/128x128/apps/windsend-rs.png
   '';
 
   postFixup = ''
diff --git a/pkgs/by-name/wi/windsend/package.nix b/pkgs/by-name/wi/windsend/package.nix
index e67a3beae31c..dc8ba2e404a9 100644
--- a/pkgs/by-name/wi/windsend/package.nix
+++ b/pkgs/by-name/wi/windsend/package.nix
@@ -35,7 +35,7 @@ flutter338.buildFlutterApplication rec {
   ];
 
   postInstall = ''
-    install -Dm644 ../../app_icon/web/icon-512.png $out/share/pixmaps/windsend.png
+    install -Dm644 ../../app_icon/web/icon-512.png $out/share/icons/hicolor/512x512/apps/windsend.png
   '';
 
   passthru.updateScript = ./update.sh;
diff --git a/pkgs/by-name/wi/windterm/package.nix b/pkgs/by-name/wi/windterm/package.nix
index e99250c70a85..9a9db4d4af50 100644
--- a/pkgs/by-name/wi/windterm/package.nix
+++ b/pkgs/by-name/wi/windterm/package.nix
@@ -73,13 +73,13 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/app $out/share/applications $out/share/pixmaps $out/share/licenses/windterm
+    mkdir -p $out/app $out/share/applications $out/share/licenses/windterm
     cp --recursive --no-preserve=mode . $out/app/windterm
     cat > $out/app/windterm/profiles.config <<EOF
     ${builtins.toJSON profiles}
     EOF
     install -Dm644 $out/app/windterm/license.txt $out/share/licenses/windterm/license.txt
-    install -Dm644 $out/app/windterm/windterm.png $out/share/pixmaps/windterm.png
+    install -Dm644 $out/app/windterm/windterm.png -t $out/share/icons/hicolor/1024x1024/apps
     substituteInPlace $out/app/windterm/windterm.desktop \
       --replace-fail "/usr/bin/" ""
     install -Dm644 $out/app/windterm/windterm.desktop $out/share/applications/windterm.desktop
diff --git a/pkgs/by-name/wo/wootility/package.nix b/pkgs/by-name/wo/wootility/package.nix
index 05526e07da46..961b2dade1a8 100644
--- a/pkgs/by-name/wo/wootility/package.nix
+++ b/pkgs/by-name/wo/wootility/package.nix
@@ -28,7 +28,7 @@ appimageTools.wrapType2 {
         --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
 
       install -Dm444 ${contents}/Wootility.desktop -t $out/share/applications
-      install -Dm444 ${contents}/Wootility.png -t $out/share/pixmaps
+      install -Dm444 ${contents}/Wootility.png -t $out/share/icons/hicolor/1024x1024/apps
       substituteInPlace $out/share/applications/Wootility.desktop \
         --replace-fail 'Exec=AppRun --no-sandbox' 'Exec=wootility'
     '';
diff --git a/pkgs/by-name/wp/wpprobe/package.nix b/pkgs/by-name/wp/wpprobe/package.nix
index de38d1b499f4..5f5932fe4f78 100644
--- a/pkgs/by-name/wp/wpprobe/package.nix
+++ b/pkgs/by-name/wp/wpprobe/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "wpprobe";
-  version = "0.10.14";
+  version = "0.10.15";
 
   src = fetchFromGitHub {
     owner = "Chocapikk";
     repo = "wpprobe";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+Q/TMlZ3VNsuiVDCJ1UbF+pJS3RA8cJOX/3vcQ5jNPk=";
+    hash = "sha256-TdcsKcpThLX467wLy+1ziMP1wBx4qB3w03vksKcKhOk=";
   };
 
   vendorHash = "sha256-pAKFrdja+rH0kiJH6hToZwLjE8lLBHFAUCjnCLbgxVo=";
diff --git a/pkgs/by-name/ya/yabridge/hardcode-dependencies.patch b/pkgs/by-name/ya/yabridge/hardcode-dependencies.patch
index beb4766c8561..581780f1cd33 100644
--- a/pkgs/by-name/ya/yabridge/hardcode-dependencies.patch
+++ b/pkgs/by-name/ya/yabridge/hardcode-dependencies.patch
@@ -1,16 +1,3 @@
-diff --git a/meson.build b/meson.build
-index 9e69128d..8c53ac88 100644
---- a/meson.build
-+++ b/meson.build
-@@ -226,7 +226,7 @@ if is_64bit_system
-   xcb_64bit_dep = dependency('xcb')
- endif
- if with_bitbridge
--  xcb_32bit_dep = winegcc.find_library('xcb')
-+  xcb_32bit_dep = winegcc.find_library('xcb', dirs: ['@libxcb32@/lib'])
- endif
- 
- # These are all headers-only libraries, and thus won't require separate 32-bit
 diff --git a/src/common/notifications.cpp b/src/common/notifications.cpp
 index 654b6c83..78ba2fe7 100644
 --- a/src/common/notifications.cpp
diff --git a/pkgs/by-name/ya/yabridge/package.nix b/pkgs/by-name/ya/yabridge/package.nix
index 0735d19ddfc5..e5f0ee796df9 100644
--- a/pkgs/by-name/ya/yabridge/package.nix
+++ b/pkgs/by-name/ya/yabridge/package.nix
@@ -1,9 +1,8 @@
 {
   lib,
-  multiStdenv,
+  stdenv,
   fetchFromGitHub,
   replaceVars,
-  pkgsi686Linux,
   dbus,
   meson,
   ninja,
@@ -73,7 +72,7 @@ let
     hash = "sha256-LsPHPoAL21XOKmF1Wl/tvLJGzjaCLjaDAcUtDvXdXSU=";
   };
 in
-multiStdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "yabridge";
   version = "5.1.1";
 
@@ -105,7 +104,6 @@ multiStdenv.mkDerivation (finalAttrs: {
     # Hard code bitbridge & runtime dependencies
     (replaceVars ./hardcode-dependencies.patch {
       libdbus = dbus.lib;
-      libxcb32 = pkgsi686Linux.libxcb;
       inherit wine;
     })
 
@@ -140,7 +138,7 @@ multiStdenv.mkDerivation (finalAttrs: {
   mesonFlags = [
     "--cross-file"
     "cross-wine.conf"
-    "-Dbitbridge=true"
+    "-Dbitbridge=false"
 
     # Requires CMake and is unnecessary
     "-Dtomlplusplus:generate_cmake_config=false"
@@ -149,7 +147,7 @@ multiStdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
     mkdir -p "$out/bin" "$out/lib"
-    cp yabridge-host{,-32}.exe{,.so} "$out/bin"
+    cp yabridge-host.exe{,.so} "$out/bin"
     cp libyabridge{,-chainloader}-{vst2,vst3,clap}.so "$out/lib"
     runHook postInstall
   '';
diff --git a/pkgs/by-name/ya/yaml-language-server/package.nix b/pkgs/by-name/ya/yaml-language-server/package.nix
index 8445ab4f7421..6f2c85e904e0 100644
--- a/pkgs/by-name/ya/yaml-language-server/package.nix
+++ b/pkgs/by-name/ya/yaml-language-server/package.nix
@@ -5,16 +5,16 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "yaml-language-server";
-  version = "1.19.2";
+  version = "1.20.0";
 
   src = fetchFromGitHub {
     owner = "redhat-developer";
     repo = "yaml-language-server";
     tag = finalAttrs.version;
-    hash = "sha256-wy6+aOtDaWnIU4vyzrOxCZnFWtrn58+zkeU/1Kt6SLs=";
+    hash = "sha256-vfg+Ej2/uqlbkV+qQGjJE83yIeA34YLLsgD7gFeu4LU=";
   };
 
-  npmDepsHash = "sha256-8PBVVgVghZvEpxj6E2imfNbAe8f4//43oioaLnlKOE0=";
+  npmDepsHash = "sha256-H1wJ37X6MGvXQVUjmrYklpPnUdmoEDR9nrlmghZ5jnU=";
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/ya/yandex-cloud/sources.json b/pkgs/by-name/ya/yandex-cloud/sources.json
index 2240a7545487..d6ff1cbd5b5c 100644
--- a/pkgs/by-name/ya/yandex-cloud/sources.json
+++ b/pkgs/by-name/ya/yandex-cloud/sources.json
@@ -1,25 +1,25 @@
 {
-  "version": "0.192.0",
+  "version": "0.193.0",
   "binaries": {
     "aarch64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.192.0/darwin/arm64/yc",
-      "hash": "sha256-HnecHCO126C9i/jtM0mUxFtJ/mgGnzM6V/bnwTMp340="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.193.0/darwin/arm64/yc",
+      "hash": "sha256-L+0KIhwBnJ3qSDRsILOE3ZLbFpi580UQhhYEnarFgaQ="
     },
     "aarch64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.192.0/linux/arm64/yc",
-      "hash": "sha256-aUiwoz+9/immrXKAJWa0ddMr3Bq4vqDHh8VVoUEeUVs="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.193.0/linux/arm64/yc",
+      "hash": "sha256-Vf9IIZOj5kb1c5TUM4vSpwNplCnHhDE1CYd5fyagZ9s="
     },
     "i686-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.192.0/linux/386/yc",
-      "hash": "sha256-RqD3ZI3ZONFMeu6pwzzkD5pDBi8GtEaH+E+S/g47bh4="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.193.0/linux/386/yc",
+      "hash": "sha256-RQpyHlwy3bu9xdeLiqEuAt8WCAh6qafSaMXDGESkBEw="
     },
     "x86_64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.192.0/darwin/amd64/yc",
-      "hash": "sha256-eFyrf0fO4J1pMV5Iak4/D8x9Lf6F2j8ikllT7wWJMig="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.193.0/darwin/amd64/yc",
+      "hash": "sha256-k1mhTX9VtaCWDCbwwYooAOcWRB/xbSq2V0hrApVXlKE="
     },
     "x86_64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.192.0/linux/amd64/yc",
-      "hash": "sha256-3ihBkLR7MWxOEiUfU0yycqy5jzx9Xdte+YSOjslitzg="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.193.0/linux/amd64/yc",
+      "hash": "sha256-gv+mlrW1uSoSzDFDAoZeQK9dr0HIhgUuvVpppuKUe24="
     }
   }
 }
diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix
index 2e9dac81f8c2..fe3cf78432c8 100644
--- a/pkgs/by-name/ya/yara-x/package.nix
+++ b/pkgs/by-name/ya/yara-x/package.nix
@@ -22,8 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-ihNFGlPhPLCIDvFnMqKA+flD/mv9wcKgQ1txO71xOp4=";
 
-  CARGO_PROFILE_RELEASE_LTO = "fat";
-  CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
+  env = {
+    CARGO_PROFILE_RELEASE_LTO = "fat";
+    CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
+  };
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ya/yarg/package.nix b/pkgs/by-name/ya/yarg/package.nix
index 97349be2aac9..c127687c805f 100644
--- a/pkgs/by-name/ya/yarg/package.nix
+++ b/pkgs/by-name/ya/yarg/package.nix
@@ -26,12 +26,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "yarg";
-  version = "0.13.2";
+  version = "0.14.0";
 
   src = fetchzip {
     url = "https://github.com/YARC-Official/YARG/releases/download/v${finalAttrs.version}/YARG_v${finalAttrs.version}-Linux-x86_64.zip";
     stripRoot = false;
-    hash = "sha256-TcX4O0TDesuBMbUH8Lp6wLM8A5xzXH9Pl7vCMEIhQvE=";
+    hash = "sha256-l83tnEO9hHFiaks7D/y9D1HJKihU7+cvsvkbIKkNeuk=";
   };
 
   nativeBuildInputs = [ autoPatchelfHook ];
diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/default.nix b/pkgs/by-name/ya/yarn-berry/fetcher/default.nix
index a9e3b920fe04..5392c6450ccd 100644
--- a/pkgs/by-name/ya/yarn-berry/fetcher/default.nix
+++ b/pkgs/by-name/ya/yarn-berry/fetcher/default.nix
@@ -8,6 +8,7 @@
   zlib-ng,
   makeScopeWithSplicing',
   generateSplicesForMkScope,
+  fetchpatch,
 }:
 
 let
@@ -46,9 +47,22 @@ let
       libzip =
         (libzip.override {
           # Known good version: 2.2.4
-          zlib = zlib-ng.override {
-            withZlibCompat = true;
-          };
+          zlib =
+            (zlib-ng.overrideAttrs (old: {
+              patches = old.patches or [ ] ++ [
+                # Yarn hashes the output of libzip(untar(tarball)), so the output of libzip
+                # needs to be an exact match across versions, and this commit changes the
+                # exact output. This is ridiculous, but such is life.
+                (fetchpatch {
+                  url = "https://github.com/zlib-ng/zlib-ng/commit/be819413be8a284b1827437006c0859644d0c367.patch";
+                  revert = true;
+                  hash = "sha256-rwRcNKpA2dMWkC6WRATDOCYCDDqqPvFJkQ6DLDohQd8=";
+                })
+              ];
+            })).override
+              {
+                withZlibCompat = true;
+              };
         }).overrideAttrs
           (old: {
             patches = (old.patches or [ ]) ++ [
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 3da7c6df7cdb..76889dfef407 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -107,7 +107,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.223.3";
+  version = "0.224.6";
 
   outputs = [
     "out"
@@ -120,7 +120,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BxSvMbZ5RrVxCmqIvpzgUCcFMmDQsYufDCz0igkwLkk=";
+    hash = "sha256-GbTWkD+JVYr+jem9MBQ4bTtPDogIU1XfQy2RmsnY9uI=";
   };
 
   postPatch = ''
@@ -140,7 +140,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm -r $out/git/*/candle-book/
   '';
 
-  cargoHash = "sha256-cGobyrF3upHZy2m1eDHibZzTkgdN5rUYXLV0zu6F6tk=";
+  cargoHash = "sha256-FTbxMJrub0l0hL8zisD2Ov9JXIRwZjOuTkzjmrImOd4=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/zr/zrepl/package.nix b/pkgs/by-name/zr/zrepl/package.nix
index 1f1a8c7999b4..319af942b54e 100644
--- a/pkgs/by-name/zr/zrepl/package.nix
+++ b/pkgs/by-name/zr/zrepl/package.nix
@@ -8,16 +8,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "zrepl";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "zrepl";
     repo = "zrepl";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-sFSWcJ0aBMay+ngUqnr0PKBMOfCcKHgBjff6KRpPZrg=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-D2ADK1mX6Aq0I2fBeNLZeJ0GdxWxi2ApiZqT4b72yf4=";
   };
 
-  vendorHash = "sha256-75fGejR7eiECsm1j3yIU1lAWaW9GrorrVnv8JEzkAtU=";
+  vendorHash = "sha256-yu/bKkcWhHJSQPU2F4C58RC7geVTVEcXHlV0DRn/sUs=";
 
   subPackages = [ "." ];
 
@@ -46,6 +46,7 @@ buildGoModule (finalAttrs: {
 
   meta = {
     homepage = "https://zrepl.github.io/";
+    changelog = "https://github.com/zrepl/zrepl/releases/tag/${finalAttrs.src.tag}";
     description = "One-stop, integrated solution for ZFS replication";
     platforms = lib.platforms.linux;
     license = lib.licenses.mit;
diff --git a/pkgs/desktops/lomiri/development/lomiri-api/default.nix b/pkgs/desktops/lomiri/development/lomiri-api/default.nix
index cc10b36f2a7d..903e8da48645 100644
--- a/pkgs/desktops/lomiri/development/lomiri-api/default.nix
+++ b/pkgs/desktops/lomiri/development/lomiri-api/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-api";
-  version = "0.2.3";
+  version = "0.3.0";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-api";
     tag = finalAttrs.version;
-    hash = "sha256-ypz15XX0ESkOWI6G+a9/36bRg5gBG0X4Y/EvB/m7qm8=";
+    hash = "sha256-n9TlmmRRB618cXCOmo5CYqeMog7I7VxURN9mlDhljWw=";
   };
 
   outputs = [
@@ -75,6 +75,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontWrapQtApps = true;
 
+  cmakeFlags = [
+    (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
+  ];
+
   env.FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
 
   preBuild = ''
@@ -98,6 +102,9 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Lomiri API Library for integrating with the Lomiri shell";
     homepage = "https://gitlab.com/ubports/development/core/lomiri-api";
+    changelog = "https://gitlab.com/ubports/development/core/lomiri-api/-/blob/${
+      if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+    }/ChangeLog";
     license = with lib.licenses; [
       lgpl3Only
       gpl3Only
diff --git a/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix b/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix
index a01c8e80d988..387f2e456b0c 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitLab,
+  fetchpatch,
   gitUpdater,
   cmake,
   dbus,
@@ -23,6 +24,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-d3fJiYGAYF5e6XPuZ26Lrjj8tUiquunMLDLs9PdAYcA=";
   };
 
+  patches = [
+    # Remove when version > 1.3.1
+    (fetchpatch {
+      name = "0001-lomiri-notifications-Properly-include-lomiri-shell-api-includedirs.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri-notifications/-/commit/b68e51db6df1ed2637692dbff704374ab4c53fa7.patch";
+      hash = "sha256-GWGlKQgOEy7HgzgA6H2Dmp0tB5amVcb3lj4LDT9dJCE=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace CMakeLists.txt \
       --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
diff --git a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
index e174ec60d954..36194fe15587 100644
--- a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitLab,
+  fetchpatch,
   gitUpdater,
   nixosTests,
   testers,
@@ -48,6 +49,15 @@ stdenv.mkDerivation (finalAttrs: {
     "examples"
   ];
 
+  patches = [
+    # Remove when version > 2.2.2
+    (fetchpatch {
+      name = "0001-lomiri-content-hub-Properly-include-lomiri-api-includedirs.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri-content-hub/-/commit/dab1854e5ec0a91fd28c9d84f06dcdd0af39518b.patch";
+      hash = "sha256-aQB8kLL2ZkKUOvFoDQ9rottFsCSNJ66wUjUZxP+kr5k=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace import/*/Content/CMakeLists.txt \
       --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
index 85e05783d4fb..cd2dc035498a 100644
--- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitLab,
+  fetchpatch,
   gitUpdater,
   testers,
   boost,
@@ -43,6 +44,15 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals withDocumentation [ "doc" ];
 
+  patches = [
+    # Remove when version > 0.3.0
+    (fetchpatch {
+      name = "0001-lomiri-download-manager-Properly-include-lomiri-api-includedirs.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/b847aca92cea6f729b96f7a55f765ae4d9fbf741.patch";
+      hash = "sha256-hx/b80P5nbonlP3B8ekjZjxUGV3Ofm/lai0RU1ak9Gs=";
+    })
+  ];
+
   postPatch = ''
     # Substitute systemd's prefix in pkg-config call
     substituteInPlace CMakeLists.txt \
diff --git a/pkgs/development/beam-modules/elvis-erlang/default.nix b/pkgs/development/beam-modules/elvis-erlang/default.nix
index 62e7f62f414e..9de2d3cd2c2b 100644
--- a/pkgs/development/beam-modules/elvis-erlang/default.nix
+++ b/pkgs/development/beam-modules/elvis-erlang/default.nix
@@ -11,12 +11,12 @@
 rebar3Relx rec {
   releaseType = "escript";
   pname = "elvis-erlang";
-  version = "4.2.0";
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     owner = "inaka";
     repo = "elvis";
-    hash = "sha256-O6T3/oe7npeLaaCRZLn4CtZ1WTjg98aPP9mrQoWCXgg=";
+    hash = "sha256-/a7wcST0CYVebX7XVZLaDXNJX6fsFCCoidhSqcs+mNI=";
     tag = version;
   };
 
diff --git a/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix
index f8a3f2397496..715e6ff43a51 100644
--- a/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix
+++ b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix
@@ -44,11 +44,11 @@ let
     };
     elvis_core = builder {
       name = "elvis_core";
-      version = "4.2.0";
+      version = "4.2.1";
       src = fetchHex {
         pkg = "elvis_core";
-        version = "4.2.0";
-        sha256 = "sha256-q0Z8fT/zgn+LLN23XIOKsA7qXbkOHMTH5KbXVjpXRb0=";
+        version = "4.2.1";
+        sha256 = "sha256-D3dLiR5kqMuZSf9PVUhclgjBFEFIEDqDOhAUk7l8J7I=";
       };
       beamDeps = [
         katana_code
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index b2a1896622c1..d074173a8143 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -92,6 +92,15 @@ stdenv.mkDerivation (
 
     patches = map fetchpatch' patches;
 
+    # https://github.com/ocaml/ocaml/issues/14543
+    postPatch =
+      if stdenv.cc.isClang then
+        ''
+          rm testsuite/tests/basic/trigraph.ml
+        ''
+      else
+        null;
+
     strictDeps = true;
 
     prefixKey = "-prefix ";
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 68077e4dce2e..c4325a4494f5 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -152,8 +152,6 @@ let
 
   passthru =
     let
-      # When we override the interpreter we also need to override the spliced versions of the interpreter
-      inputs' = lib.filterAttrs (n: v: n != "passthruFun" && !lib.isDerivation v) inputs;
       # Memoization of the splices to avoid re-evaluating this function for all combinations of splices e.g.
       # python3.pythonOnBuildForHost.pythonOnBuildForTarget == python3.pythonOnBuildForTarget by consuming
       # __splices as an arg and using the cache if populated.
@@ -170,13 +168,9 @@ let
       override =
         attr:
         let
-          python = attr.override (
-            inputs'
-            // {
-              self = python;
-              __splices = splices;
-            }
-          );
+          python = attr.override {
+            self = python;
+          };
         in
         python;
     in
diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix
index ea992b7b52d8..f703b4e56472 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix
@@ -7,6 +7,10 @@
 
 mkDerivation {
   pname = "kconfig";
+  outputs = [
+    "out"
+    "dev"
+  ];
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qttools ];
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
index ac1a8273362c..35d01f5e7d89 100644
--- a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
+++ b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
@@ -17,6 +17,10 @@
 
 mkDerivation {
   pname = "kxmlgui";
+  outputs = [
+    "out"
+    "dev"
+  ];
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     attica
diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix
index 80120eebe933..00278cc47213 100644
--- a/pkgs/development/libraries/libsoup/3.x.nix
+++ b/pkgs/development/libraries/libsoup/3.x.nix
@@ -44,6 +44,11 @@ stdenv.mkDerivation rec {
       url = "https://gitlab.gnome.org/GNOME/libsoup/-/commit/2316e56a5502ac4c41ef4ff56a3266e680aca129.patch";
       hash = "sha256-6TOM6sygVPpBWjTNgFG37JFbJDl0t2f9Iwidvh/isa4=";
     })
+    (fetchpatch {
+      name = "CVE-2025-11021.patch";
+      url = "https://gitlab.gnome.org/GNOME/libsoup/-/commit/9e1a427d2f047439d0320defe1593e6352595788.patch";
+      hash = "sha256-08WiDnqg4//y8uPhIcV6svWdpRo27FmW+6DHy4OEZk8=";
+    })
   ];
 
   depsBuildBuild = [
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index bee518b5a758..798be764047c 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -8,7 +8,11 @@
   pkg-config,
   abiVersion ? "6",
   enableStatic ? stdenv.hostPlatform.isStatic,
-  withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt,
+  # Disabled for static FreeBSD: libc++ headers come after C library headers,
+  # breaking C++ compilation. No current consumers need the C++ bindings.
+  withCxx ?
+    !stdenv.hostPlatform.useAndroidPrebuilt
+    && !(stdenv.hostPlatform.isFreeBSD && stdenv.hostPlatform.isStatic),
   mouseSupport ? false,
   gpm,
   withTermlib ? false,
diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index 1ce150c481d1..c76700cbd193 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -33,6 +33,7 @@
   harfbuzz,
   icu,
   dbus,
+  expat,
   libdrm,
   zlib,
   minizip,
@@ -231,6 +232,7 @@ qtModule {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     dbus
+    expat
     zlib
     minizip
     snappy
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 251fe2886d19..c98af56362d4 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -29,6 +29,7 @@
   libjxl,
   at-spi2-core,
   cairo,
+  expat,
   libxml2,
   libsoup_3,
   libsecret,
@@ -142,6 +143,7 @@ clangStdenv.mkDerivation (finalAttrs: {
     at-spi2-core
     cairo # required even when using skia
     enchant
+    expat
     flite
     libavif
     libepoxy
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 2329e91c87e7..d7f8229e17a9 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -6,7 +6,7 @@
   static ? true,
   # If true, a separate .static output is created and the .a is moved there.
   # If false, and if `{ static = true; }`, the .a stays in the main output.
-  splitStaticOutput ? shared && static,
+  splitStaticOutput ? shared && static && !stdenv.hostPlatform.isWindows,
   testers,
   minizip,
 }:
diff --git a/pkgs/development/ocaml-modules/synchronizer/default.nix b/pkgs/development/ocaml-modules/synchronizer/default.nix
index a3cb79b7467f..b3d813b2ebe3 100644
--- a/pkgs/development/ocaml-modules/synchronizer/default.nix
+++ b/pkgs/development/ocaml-modules/synchronizer/default.nix
@@ -8,7 +8,7 @@
 
 buildDunePackage (finalAttrs: {
   pname = "synchronizer";
-  version = "0.2";
+  version = "0.3";
 
   minimalOCamlVersion = "5.2";
 
@@ -16,7 +16,7 @@ buildDunePackage (finalAttrs: {
     owner = "OCamlPro";
     repo = "synchronizer";
     tag = finalAttrs.version;
-    hash = "sha256-0XtPHpDlyH1h8W2ZlRvJbZjCN9WP5mzk2N01WFd8eLQ=";
+    hash = "sha256-zomP15CRV6pFK3yk9hMCSDHPk11hEqXiRw8vr2Dg0CI=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/a2a-sdk/default.nix b/pkgs/development/python-modules/a2a-sdk/default.nix
index d352cc2f5bfd..960b7d04ee19 100644
--- a/pkgs/development/python-modules/a2a-sdk/default.nix
+++ b/pkgs/development/python-modules/a2a-sdk/default.nix
@@ -18,6 +18,9 @@
   pydantic,
   pyjwt,
   pytest-asyncio,
+  pytest-cov-stub,
+  pytest-timeout,
+  pytest-xdist,
   pytestCheckHook,
   pythonAtLeast,
   respx,
@@ -30,14 +33,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "a2a-sdk";
-  version = "0.3.22";
+  version = "0.3.23";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "a2aproject";
     repo = "a2a-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RGD55BGxWSPJXKqDPcTYW3pIzlOVPoOqd3hyTArifqc=";
+    hash = "sha256-F7tu+coSNNrLT36DFaHdoFe7hBG5lA69O5ktnxfJlZI=";
   };
 
   build-system = [
@@ -65,10 +68,22 @@ buildPythonPackage (finalAttrs: {
       sse-starlette
       starlette
     ];
-    mysql = [ sqlalchemy ];
-    postgresql = [ sqlalchemy ];
+    mysql = [
+      sqlalchemy
+    ]
+    ++ sqlalchemy.optional-dependencies.asyncio
+    ++ sqlalchemy.optional-dependencies.postgresql_asyncpg;
+    postgresql = [
+      sqlalchemy
+    ]
+    ++ sqlalchemy.optional-dependencies.asyncio
+    ++ sqlalchemy.optional-dependencies.postgresql_asyncpg;
     signing = [ pyjwt ];
-    sqlite = [ sqlalchemy ];
+    sqlite = [
+      sqlalchemy
+    ]
+    ++ sqlalchemy.optional-dependencies.asyncio
+    ++ sqlalchemy.optional-dependencies.aiosqlite;
     telemetry = [
       opentelemetry-api
       opentelemetry-sdk
@@ -78,6 +93,9 @@ buildPythonPackage (finalAttrs: {
   nativeCheckInputs = [
     aiosqlite
     pytest-asyncio
+    pytest-cov-stub
+    pytest-timeout
+    pytest-xdist
     pytestCheckHook
     respx
     uvicorn
diff --git a/pkgs/development/python-modules/adafruit-io/default.nix b/pkgs/development/python-modules/adafruit-io/default.nix
index 84f659f9d4a5..2bbb400a48ee 100644
--- a/pkgs/development/python-modules/adafruit-io/default.nix
+++ b/pkgs/development/python-modules/adafruit-io/default.nix
@@ -5,24 +5,28 @@
   paho-mqtt,
   pytestCheckHook,
   requests,
+  setuptools,
   setuptools-scm,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "adafruit-io";
-  version = "2.8.0";
-  format = "setuptools";
+  version = "2.8.2";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "adafruit";
     repo = "Adafruit_IO_Python";
-    tag = version;
-    hash = "sha256-OwTHMyc2ePSdYVuY1h3PY+uDBl6/7fTMXiZC3sZm8fU=";
+    tag = finalAttrs.version;
+    hash = "sha256-JYQKrGg4FRzqq3wy/TqafC16rldvPEi+/xEI7XGvWM8=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     paho-mqtt
     requests
   ];
@@ -41,7 +45,8 @@ buildPythonPackage rec {
   meta = {
     description = "Module for interacting with Adafruit IO";
     homepage = "https://github.com/adafruit/Adafruit_IO_Python";
+    changelog = "https://github.com/adafruit/Adafruit_IO_Python/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/aioshutil/default.nix b/pkgs/development/python-modules/aioshutil/default.nix
deleted file mode 100644
index 89943276b87b..000000000000
--- a/pkgs/development/python-modules/aioshutil/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pytest-asyncio,
-  pytest-cov-stub,
-  pytestCheckHook,
-  setuptools-scm,
-}:
-
-buildPythonPackage rec {
-  pname = "aioshutil";
-  version = "1.6";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "kumaraditya303";
-    repo = "aioshutil";
-    tag = "v${version}";
-    hash = "sha256-+8BpL9CVH0X/9H7vL4xuV5CdA3A10a2A1q4wt1x1sSM=";
-  };
-
-  build-system = [ setuptools-scm ];
-
-  nativeCheckInputs = [
-    pytest-asyncio
-    pytest-cov-stub
-    pytestCheckHook
-  ];
-
-  pythonImportsCheck = [ "aioshutil" ];
-
-  meta = {
-    description = "Asynchronous version of function of shutil module";
-    homepage = "https://github.com/kumaraditya303/aioshutil";
-    changelog = "https://github.com/kumaraditya303/aioshutil/releases/tag/${src.tag}";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/development/python-modules/aiosolaredge/default.nix b/pkgs/development/python-modules/aiosolaredge/default.nix
index 5fd9bc08a973..661a21d74495 100644
--- a/pkgs/development/python-modules/aiosolaredge/default.nix
+++ b/pkgs/development/python-modules/aiosolaredge/default.nix
@@ -5,26 +5,24 @@
   poetry-core,
   aiohttp,
   yarl,
+  aioresponses,
   pytest-asyncio,
+  pytest-cov-stub,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "aiosolaredge";
-  version = "0.2.0";
+  version = "1.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aiosolaredge";
     tag = "v${version}";
-    hash = "sha256-1C74U5HWDTJum1XES21t1uIJwm0YW3l041mwvqY/dA4=";
+    hash = "sha256-1RdkYcdhhU+MaP91iJ1tSrL0OlUi6Il1XBXnmRYhC7g=";
   };
 
-  postPatch = ''
-    sed -i "/^addopts/d" pyproject.toml
-  '';
-
   build-system = [ poetry-core ];
 
   dependencies = [
@@ -35,12 +33,14 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "aiosolaredge" ];
 
   nativeCheckInputs = [
+    aioresponses
     pytest-asyncio
+    pytest-cov-stub
     pytestCheckHook
   ];
 
   meta = {
-    changelog = "https://github.com/bdraco/aiosolaredge/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/bdraco/aiosolaredge/blob/${src.tag}/CHANGELOG.md";
     description = "Asyncio SolarEdge API client";
     homepage = "https://github.com/bdraco/aiosolaredge";
     license = lib.licenses.mit;
diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index 15edb40d3575..84be3d90c8cd 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -11,14 +11,12 @@
   # dependencies
   exceptiongroup,
   idna,
-  sniffio,
   typing-extensions,
 
   # optionals
   trio,
 
   # tests
-  blockbuster,
   hypothesis,
   psutil,
   pytest-mock,
@@ -47,7 +45,6 @@ buildPythonPackage rec {
 
   dependencies = [
     idna
-    sniffio
   ]
   ++ lib.optionals (pythonOlder "3.13") [
     typing-extensions
@@ -58,7 +55,6 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
-    blockbuster
     exceptiongroup
     hypothesis
     psutil
diff --git a/pkgs/development/python-modules/appium-python-client/default.nix b/pkgs/development/python-modules/appium-python-client/default.nix
index 3ffb1aab7663..0fdb4cfb2f2c 100644
--- a/pkgs/development/python-modules/appium-python-client/default.nix
+++ b/pkgs/development/python-modules/appium-python-client/default.nix
@@ -6,30 +6,29 @@
   selenium,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "appium-python-client";
-  version = "5.2.5";
+  version = "5.2.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "appium";
     repo = "python-client";
-    tag = "v${version}";
-    sha256 = "sha256-BrKIZR8n5ZiOfGAxgCtt5FwPbbOtlPfMqW91HKjP5ro=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-BTbz2ncCl6C2QBCLMaIZn4fv/ib/IvkWoRSrlxuFauM=";
   };
 
   build-system = [ hatchling ];
 
-  dependencies = [
-    selenium
-  ];
+  dependencies = [ selenium ];
 
   pythonImportsCheck = [ "appium" ];
 
   meta = {
     description = "Cross-platform automation framework for all kinds of apps, built on top of the W3C WebDriver protocol";
     homepage = "https://appium.io/";
+    changelog = "https://github.com/appium/python-client/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ eyjhb ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/awsiotsdk/default.nix b/pkgs/development/python-modules/awsiotsdk/default.nix
index abc297899a6f..51e03c75e920 100644
--- a/pkgs/development/python-modules/awsiotsdk/default.nix
+++ b/pkgs/development/python-modules/awsiotsdk/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "awsiotsdk";
-  version = "1.28.0";
+  version = "1.28.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-iot-device-sdk-python-v2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Cs+MbI/23bPvdZNaze7ENyEZNT/AVYsPz/dEEzaAy8c=";
+    hash = "sha256-UOM3V9ABoNbX+Nr8SyJueT6tIQRLj5R1TyWFxbpylrA=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 90790dc4a1c7..4b03b1e227f7 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "boto3-stubs";
-  version = "1.42.49";
+  version = "1.42.51";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit (finalAttrs) version;
-    hash = "sha256-jtsicmz0tzPgCHM/TUSt3jiet2SLDCLPBxpnX+2Nqqs=";
+    hash = "sha256-D9ydekPsV5DABnz6A39AGPmSfCh/3y+c1cmEkXNlbsA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix
index c25d7f157eed..d0dfe72e90c1 100644
--- a/pkgs/development/python-modules/cachecontrol/default.nix
+++ b/pkgs/development/python-modules/cachecontrol/default.nix
@@ -25,6 +25,11 @@ buildPythonPackage rec {
     hash = "sha256-627SqJocVOO0AfI8vswPqOr15MA/Lx7RLAdRAXzWu84=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.9.6,<0.10.0" uv_build
+  '';
+
   build-system = [ uv-build ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix
index aa10d25bd9f2..01c547d503a9 100644
--- a/pkgs/development/python-modules/chromadb/default.nix
+++ b/pkgs/development/python-modules/chromadb/default.nix
@@ -68,14 +68,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "chromadb";
-  version = "1.4.1";
+  version = "1.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chroma-core";
     repo = "chroma";
     tag = finalAttrs.version;
-    hash = "sha256-mtUxyuLiwA4l9u+pTPVIsYcvsLPPCI6c8iWK6Lgbwjc=";
+    hash = "sha256-cjSWgXE5FiTIHzTjkpnaikKCgzLazG1wZYh2J0JbJ2Y=";
   };
 
   # https://github.com/chroma-core/chroma/issues/5996
@@ -83,7 +83,7 @@ buildPythonPackage (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-WdWc/8vNzcEtdxmAAbBDWxhMamxSnK2YaZPWwQ2zzU4=";
+    hash = "sha256-oS+fT+mGz0b0O8s5hff85d26Czu+nI7sPjY3qwtTkM4=";
   };
 
   # Can't use fetchFromGitHub as the build expects a zipfile
diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix
index 1c9530598bc3..bad029613fe8 100644
--- a/pkgs/development/python-modules/cohere/default.nix
+++ b/pkgs/development/python-modules/cohere/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "cohere";
-  version = "5.20.4";
+  version = "5.20.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cohere-ai";
     repo = "cohere-python";
     tag = version;
-    hash = "sha256-rIyiqlh8gnkHGJQs9EqNruVTvaScFwoEtF5YaEPzhXQ=";
+    hash = "sha256-eVifLH1IG3O4OlXWkKV6nS4UB1W5cbQPGkrxuz8IF7Q=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix
index 832c4ce358a8..705466ed4d33 100644
--- a/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/pkgs/development/python-modules/cryptography/vectors.nix
@@ -14,16 +14,10 @@ buildPythonPackage rec {
 
   sourceRoot = "${src.name}/vectors";
 
-  patches = [
-    # https://github.com/NixOS/nixpkgs/pull/449568
-    (fetchpatch2 {
-      name = "uv-build.patch";
-      url = "https://github.com/pyca/cryptography/commit/5f311c1cbe09ddea6136b0bb737fb7df6df1b923.patch?full_index=1";
-      stripLen = 1;
-      includes = [ "pyproject.toml" ];
-      hash = "sha256-OdHK0OGrvOi3mS0q+v8keDLvKxtgQkDkHQSYnmC/vd4=";
-    })
-  ];
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.7.19,<0.9.0" "uv_build>=0.7.19,<0.11.0"
+  '';
 
   build-system = [ uv-build ];
 
diff --git a/pkgs/development/python-modules/cyvest/default.nix b/pkgs/development/python-modules/cyvest/default.nix
index 839ab85198d1..fdd7759ac663 100644
--- a/pkgs/development/python-modules/cyvest/default.nix
+++ b/pkgs/development/python-modules/cyvest/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cyvest";
-  version = "5.2.1";
+  version = "5.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PakitoSec";
     repo = "cyvest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fYFYIcjbO9dyOFiuKU077T/88fo6A6nIr04kZgL8ta0=";
+    hash = "sha256-FoQxhQHV1VuLfCsi3eRtxhFhuiHOtRDQc8+bhln+MOQ=";
   };
 
   pythonRelaxDeps = [ "pydantic" ];
diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix
index abc30320ad11..9261412cbca9 100644
--- a/pkgs/development/python-modules/dateparser/default.nix
+++ b/pkgs/development/python-modules/dateparser/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   setuptools,
   python-dateutil,
   pytz,
@@ -11,6 +10,7 @@
   hijridate,
   convertdate,
   fasttext,
+  numpy,
   langdetect,
   parameterized,
   pytestCheckHook,
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "dateparser";
-  version = "1.2.2";
+  version = "1.3.0";
 
   pyproject = true;
 
@@ -30,25 +30,12 @@ buildPythonPackage rec {
     owner = "scrapinghub";
     repo = "dateparser";
     tag = "v${version}";
-    hash = "sha256-cUbY6c0JFzs1oZJOTnMXz3uCah2f50g8/3uWQXtwiGY=";
+    hash = "sha256-X15zNHlF34+8Lmo6Ia3HyKOdfgsu76KbcJUxzHax0EE=";
   };
 
-  patches = [
-    (fetchpatch {
-      # https://github.com/scrapinghub/dateparser/pull/1294
-      url = "https://github.com/scrapinghub/dateparser/commit/6b23348b9367d43bebc9a40b00dda3363eb2acd5.patch";
-      hash = "sha256-LriRbGdYxF51Nwrm7Dp4kivyMikzmhytNQo0txMGsVI=";
-    })
-    (fetchpatch {
-      url = "https://github.com/scrapinghub/dateparser/commit/cbe29797c463c7939234df2923af310ed10aeb4f.patch";
-      includes = [ "dateparser_scripts/write_complete_data.py" ];
-      hash = "sha256-mDHDZlWU2G/NU2W+dxSRb6rRb/bp2PoTbgz8wXhaNCo=";
-    })
-  ];
+  build-system = [ setuptools ];
 
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     python-dateutil
     pytz
     regex
@@ -60,7 +47,10 @@ buildPythonPackage rec {
       hijridate
       convertdate
     ];
-    fasttext = [ fasttext ];
+    fasttext = [
+      fasttext
+      numpy
+    ];
     langdetect = [ langdetect ];
   };
 
@@ -85,10 +75,6 @@ buildPythonPackage rec {
     # access network
     "test_custom_language_detect_fast_text_0"
     "test_custom_language_detect_fast_text_1"
-
-    # breaks with latest tzdata: https://github.com/scrapinghub/dateparser/issues/1237
-    # FIXME: look into this more
-    "test_relative_base"
   ];
 
   pythonImportsCheck = [ "dateparser" ];
diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix
index 1e1d0ee67d18..ef8b3b25c92c 100644
--- a/pkgs/development/python-modules/dbt-common/default.nix
+++ b/pkgs/development/python-modules/dbt-common/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "dbt-common";
-  version = "1.37.2-unstable-2026-01-22";
+  version = "1.37.2-unstable-2026-02-16";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dbt-labs";
     repo = "dbt-common";
-    rev = "5b331b9c50ca5fee959a9e4fa9ecca964549930c"; # They don't tag releases
-    hash = "sha256-OF4zKmKVHa9SdiQ1WRLvNoqQd3FWCUr5hK9ZYls9EsY=";
+    rev = "db568b8aa2d7c081f36a144c379668dd65007803"; # They don't tag releases
+    hash = "sha256-FIc98xjdmEQ8QJQwvEktj7oT/hJwwqCg4agpR4gaZIc=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index fd39445427b2..27255ab899cd 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "debugpy";
-  version = "1.8.19";
+  version = "1.8.20";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -42,7 +42,7 @@ buildPythonPackage rec {
       sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' "$out/src/debugpy/_version.py"
     '';
 
-    hash = "sha256-O9RHqyV7xMMnouCp4t18CNH/z2jBxZBUkybAw1c2gY0=";
+    hash = "sha256-0h2VQU5eYb0heXSFmKnwAFW0jcWc+bYllhwxfdzkGWc=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix
index 3763b143b7d7..3ec990d64a56 100644
--- a/pkgs/development/python-modules/dj-database-url/default.nix
+++ b/pkgs/development/python-modules/dj-database-url/default.nix
@@ -18,6 +18,11 @@ buildPythonPackage rec {
     hash = "sha256-zQiyEtDTFZHwuEIfRZHdgszyfsRSayFqPv9MIS4Ip6s=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.9.17,<0.10.0" uv_build
+  '';
+
   build-system = [ uv-build ];
 
   dependencies = [ django ];
diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index 033982391633..89cd09f6543a 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -41,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "django-allauth";
-  version = "65.14.0";
+  version = "65.14.3";
   pyproject = true;
 
   src = fetchFromCodeberg {
     owner = "allauth";
     repo = "django-allauth";
     tag = version;
-    hash = "sha256-hoPNSMzn/bX98Qe+7guaLK8UhA5FfHpUCjzN6hCXVgs=";
+    hash = "sha256-Kr6iYN+qM1ZdtQAJ9Ks+zC70AiiUi2IY2O/G9S+tTmI=";
   };
 
   nativeBuildInputs = [ gettext ];
diff --git a/pkgs/development/python-modules/django-countries/default.nix b/pkgs/development/python-modules/django-countries/default.nix
index e79d314f2545..5836247abd8c 100644
--- a/pkgs/development/python-modules/django-countries/default.nix
+++ b/pkgs/development/python-modules/django-countries/default.nix
@@ -30,6 +30,11 @@ buildPythonPackage rec {
     hash = "sha256-MtRlZFrTlY7t0n08X0aYN5HRGZUGLHkcU1gaZCtj07Q=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.9.6,<0.10.0" uv_build
+  '';
+
   build-system = [ uv-build ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/django-pydantic-field/default.nix b/pkgs/development/python-modules/django-pydantic-field/default.nix
index 6a6b743fd47c..124b6b8e9bda 100644
--- a/pkgs/development/python-modules/django-pydantic-field/default.nix
+++ b/pkgs/development/python-modules/django-pydantic-field/default.nix
@@ -10,28 +10,35 @@
   pytest-django,
   djangorestframework,
   pyyaml,
-  setuptools,
   syrupy,
+  typing-extensions,
   uritemplate,
+  uv-build,
 }:
 
 buildPythonPackage rec {
   pname = "django-pydantic-field";
-  version = "0.5.1";
+  version = "0.5.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "surenkov";
     repo = "django-pydantic-field";
     tag = "v${version}";
-    hash = "sha256-ip8izfITsf15GaukXr8N4DcErq22LJzM7nlGBhfLkpU=";
+    hash = "sha256-BqQurRjtA9AxvagmMIt+QjKKVdyFo+LVgn/vYS6+Ayc=";
   };
 
-  build-system = [ setuptools ];
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.9.17,<0.10.0" uv_build
+  '';
+
+  build-system = [ uv-build ];
 
   dependencies = [
     django
     pydantic
+    typing-extensions
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix
index d50320e3f4d1..e19e098dcbde 100644
--- a/pkgs/development/python-modules/docling-core/default.nix
+++ b/pkgs/development/python-modules/docling-core/default.nix
@@ -64,6 +64,7 @@ buildPythonPackage (finalAttrs: {
 
   pythonRelaxDeps = [
     "pillow"
+    "typer"
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/emulated-roku/default.nix b/pkgs/development/python-modules/emulated-roku/default.nix
index 22933e51d6b2..0854add08ed6 100644
--- a/pkgs/development/python-modules/emulated-roku/default.nix
+++ b/pkgs/development/python-modules/emulated-roku/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "emulated-roku";
-  version = "0.4.0";
+  version = "0.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mindigmarton";
     repo = "emulated_roku";
     tag = version;
-    hash = "sha256-lPe0mXtl1IQx//IydnmddpV11CpOi/MKq9TUOAKuoeU=";
+    hash = "sha256-KwDEajkrEEgobORetM/rROMDLZvw9AJmmr1jmXAJJbk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix
index ac3ac7e676d9..d55affdc2484 100644
--- a/pkgs/development/python-modules/exceptiongroup/default.nix
+++ b/pkgs/development/python-modules/exceptiongroup/default.nix
@@ -6,6 +6,7 @@
   pytestCheckHook,
   pythonAtLeast,
   pythonOlder,
+  isPy313,
   typing-extensions,
 }:
 
@@ -21,6 +22,15 @@ buildPythonPackage rec {
     hash = "sha256-3WInufN+Pp6vB/Gik6e8V1a34Dr/oiH3wDMB+2lHRMM=";
   };
 
+  # CPython fixed https://github.com/python/cpython/issues/141732 in
+  # https://github.com/python/cpython/pull/141736, but exceptiongroup 1.3.1,
+  # including its test suite, still matches the old repr behavior.
+  # The CPython fix has only been backported to 3.13 so far, where it was
+  # first included in version 3.13.12, so we only need to patch for 3.13
+  # and 3.15+.
+  # Upstream issue: https://github.com/agronholm/exceptiongroup/issues/154
+  patches = lib.optional (isPy313 || pythonAtLeast "3.15") ./match-repr-fix.patch;
+
   build-system = [ flit-scm ];
 
   dependencies = lib.optionals (pythonOlder "3.13") [ typing-extensions ];
diff --git a/pkgs/development/python-modules/exceptiongroup/match-repr-fix.patch b/pkgs/development/python-modules/exceptiongroup/match-repr-fix.patch
new file mode 100644
index 000000000000..ed09c9f39600
--- /dev/null
+++ b/pkgs/development/python-modules/exceptiongroup/match-repr-fix.patch
@@ -0,0 +1,48 @@
+From 9be2b65dbd8366da27cd79c09195493217dbf539 Mon Sep 17 00:00:00 2001
+From: Tom Hunze <dev@thunze.de>
+Date: Sat, 7 Feb 2026 11:37:49 +0100
+Subject: [PATCH] Fix `ExceptionGroup` repr changing when original exception
+ sequence is mutated
+
+https://github.com/python/cpython/pull/141736
+---
+ src/exceptiongroup/_exceptions.py | 3 ++-
+ tests/test_exceptions.py          | 3 +--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/exceptiongroup/_exceptions.py b/src/exceptiongroup/_exceptions.py
+index f42c1ad..996d8e1 100644
+--- a/src/exceptiongroup/_exceptions.py
++++ b/src/exceptiongroup/_exceptions.py
+@@ -101,6 +101,7 @@ class BaseExceptionGroup(BaseException, Generic[_BaseExceptionT_co]):
+                         )
+ 
+         instance = super().__new__(cls, __message, __exceptions)
++        instance._exceptions_str = repr(__exceptions)
+         instance._exceptions = tuple(__exceptions)
+         return instance
+ 
+@@ -275,7 +276,7 @@ class BaseExceptionGroup(BaseException, Generic[_BaseExceptionT_co]):
+         return f"{self.message} ({len(self._exceptions)} sub-exception{suffix})"
+ 
+     def __repr__(self) -> str:
+-        return f"{self.__class__.__name__}({self.args[0]!r}, {self.args[1]!r})"
++        return f"{self.__class__.__name__}({self.args[0]!r}, {self._exceptions_str})"
+ 
+ 
+ class ExceptionGroup(BaseExceptionGroup[_ExceptionT_co], Exception):
+diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py
+index e2bc81a..a253236 100644
+--- a/tests/test_exceptions.py
++++ b/tests/test_exceptions.py
+@@ -883,6 +883,5 @@ def test_exceptions_mutate_original_sequence():
+     exceptions.append(KeyError("bar"))
+     assert excgrp.exceptions is exc_tuple
+     assert repr(excgrp) == (
+-        "BaseExceptionGroup('foo', [ValueError(1), KeyboardInterrupt(), "
+-        "KeyError('bar')])"
++        "BaseExceptionGroup('foo', [ValueError(1), KeyboardInterrupt()])"
+     )
+-- 
+2.51.2
+
diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix
index 0408a8995a7e..32b330d35bbf 100644
--- a/pkgs/development/python-modules/fastapi-mail/default.nix
+++ b/pkgs/development/python-modules/fastapi-mail/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "fastapi-mail";
-  version = "1.6.1";
+  version = "1.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sabuhish";
     repo = "fastapi-mail";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ruiUf+wGJRMLzmimb9oLi/tGV6UF9aa9G/iMgptSa9w=";
+    hash = "sha256-oWm2FvXCyz+0QRvClcJoKF17rWggAtQasa5h1pZ6N4Y=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix
index d2aad42b2a99..bdb886cec55c 100644
--- a/pkgs/development/python-modules/ffmpy/default.nix
+++ b/pkgs/development/python-modules/ffmpy/default.nix
@@ -21,20 +21,23 @@ buildPythonPackage rec {
     hash = "sha256-TDE/r6qoWpkIU47+FPLqWgZAJd9FxSbZthhLh9g4evo=";
   };
 
-  postPatch =
-    # Default to store ffmpeg.
-    ''
-      substituteInPlace ffmpy/ffmpy.py \
-        --replace-fail \
-          'executable: str = "ffmpeg",' \
-          'executable: str = "${lib.getExe ffmpeg-headless}",'
-    ''
-    # The tests test a mock that does not behave like ffmpeg. If we default to the nix-store ffmpeg they fail.
-    + ''
-      for fname in tests/*.py; do
-        echo >>"$fname" 'FFmpeg.__init__.__defaults__ = ("ffmpeg", *FFmpeg.__init__.__defaults__[1:])'
-      done
-    '';
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.7.9,<0.10.0" uv_build
+  ''
+  # Default to store ffmpeg.
+  + ''
+    substituteInPlace ffmpy/ffmpy.py \
+      --replace-fail \
+        'executable: str = "ffmpeg",' \
+        'executable: str = "${lib.getExe ffmpeg-headless}",'
+  ''
+  # The tests test a mock that does not behave like ffmpeg. If we default to the nix-store ffmpeg they fail.
+  + ''
+    for fname in tests/*.py; do
+      echo >>"$fname" 'FFmpeg.__init__.__defaults__ = ("ffmpeg", *FFmpeg.__init__.__defaults__[1:])'
+    done
+  '';
 
   pythonImportsCheck = [ "ffmpy" ];
 
diff --git a/pkgs/development/python-modules/functions-framework/default.nix b/pkgs/development/python-modules/functions-framework/default.nix
index be1135a67db1..d80198bfd1ce 100644
--- a/pkgs/development/python-modules/functions-framework/default.nix
+++ b/pkgs/development/python-modules/functions-framework/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "functions-framework";
-  version = "3.10.0";
+  version = "3.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "functions-framework-python";
     tag = "v${version}";
-    hash = "sha256-wH/6EOxdmEHq799MWcDyqdrgiurOHFFv7+cE9mWHhl0=";
+    hash = "sha256-CEH0PokH3lhyJl7OPIpJkaKZxAUp1fYVia89DtGoJ7k=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/gawd/default.nix b/pkgs/development/python-modules/gawd/default.nix
index c61eb13f7ecb..227a5faef656 100644
--- a/pkgs/development/python-modules/gawd/default.nix
+++ b/pkgs/development/python-modules/gawd/default.nix
@@ -3,40 +3,38 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
-  wheel,
   ruamel-yaml,
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "gawd";
   version = "1.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "pooya-rostami";
+    owner = "sgl-umons";
     repo = "gawd";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-DCcU7vO5VApRsO+ljVs827TrHIfe3R+1/2wgBEcp1+c=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
-    wheel
   ];
 
-  propagatedBuildInputs = [ ruamel-yaml ];
+  dependencies = [ ruamel-yaml ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "gawd" ];
 
   meta = {
-    changelog = "https://github.com/pooya-rostami/gawd/releases/tag/${version}";
+    changelog = "https://github.com/sgl-umons/gawd/releases/tag/${finalAttrs.version}";
     description = "Python library and command-line tool for computing syntactic differences between two GitHub Actions workflow files";
     mainProgram = "gawd";
-    homepage = "https://github.com/pooya-rostami/gawd";
+    homepage = "https://github.com/sgl-umons/gawd";
     license = lib.licenses.lgpl3Only;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ drupol ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/ghmap/default.nix b/pkgs/development/python-modules/ghmap/default.nix
new file mode 100644
index 000000000000..10e26fb89714
--- /dev/null
+++ b/pkgs/development/python-modules/ghmap/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  tqdm,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "ghmap";
+  version = "2.0.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "sgl-umons";
+    repo = "ghmap";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UF7Zxrm+thZeAKPiCaI5t4NbDzuUU3oosPsb0Cgv9t0=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    tqdm
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [
+    "ghmap"
+  ];
+
+  meta = {
+    description = "A Python tool for mapping GitHub events to contributor activities";
+    homepage = "https://github.com/sgl-umons/ghmap";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+})
diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix
index 22ae05de7b6b..480ea1bd24bd 100644
--- a/pkgs/development/python-modules/glyphslib/default.nix
+++ b/pkgs/development/python-modules/glyphslib/default.nix
@@ -15,17 +15,17 @@
   skia-pathops,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "glyphslib";
-  version = "6.12.6";
+  version = "6.12.7";
 
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "glyphsLib";
-    tag = "v${version}";
-    hash = "sha256-okN/+/+5k+KOlcInouiadKP8aJVV8yqHZnmucXkQsGM=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Vqgk5DNy3rKMOi+A6zvYTvcI0K5TdepUJhc5oF9SXbE=";
   };
 
   build-system = [ setuptools-scm ];
@@ -54,8 +54,8 @@ buildPythonPackage rec {
   meta = {
     description = "Bridge from Glyphs source files (.glyphs) to UFOs and Designspace files via defcon and designspaceLib";
     homepage = "https://github.com/googlefonts/glyphsLib";
-    changelog = "https://github.com/googlefonts/glyphsLib/releases/tag/${src.tag}";
+    changelog = "https://github.com/googlefonts/glyphsLib/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/graphemeu/default.nix b/pkgs/development/python-modules/graphemeu/default.nix
index 060aae37b12e..bb55c7cd2179 100644
--- a/pkgs/development/python-modules/graphemeu/default.nix
+++ b/pkgs/development/python-modules/graphemeu/default.nix
@@ -7,7 +7,7 @@
   pytest-cov-stub,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "graphemeu";
   version = "0.10.0";
   pyproject = true;
@@ -15,24 +15,28 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "timendum";
     repo = "grapheme";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-qDspbeOmlfQ4VLPdKEuxNPYilKjwUcAJiEOMfx9fFlI=";
   };
 
-  build-system = [ hatchling ];
+  build-system = [
+    hatchling
+  ];
 
   nativeCheckInputs = [
     pytest-cov-stub
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "grapheme" ];
+  pythonImportsCheck = [
+    "grapheme"
+  ];
 
   meta = {
     description = "Python package for grapheme aware string handling";
     homepage = "https://github.com/timendum/grapheme";
-    changelog = "https://github.com/timendum/grapheme/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/timendum/grapheme/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ anthonyroussel ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index 552d257d8085..00033efa4620 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   protobuf,
+  cython,
   grpcio,
   setuptools,
 }:
@@ -21,6 +22,11 @@ buildPythonPackage rec {
     hash = "sha256-Sw3YZWAnQxbhVdklFYJ2+FZFCBkwiLxD4g0/Xf+Vays=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "Cython==3.1.1" Cython
+  '';
+
   outputs = [
     "out"
     "dev"
@@ -28,7 +34,10 @@ buildPythonPackage rec {
 
   enableParallelBuilding = true;
 
-  build-system = [ setuptools ];
+  build-system = [
+    cython
+    setuptools
+  ];
 
   pythonRelaxDeps = [
     "protobuf"
diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index f7f656a3f480..722d3990eafe 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -26,6 +26,11 @@ buildPythonPackage rec {
     hash = "sha256-c4K5UYlUbzdcF09TpfqHPO+RxLgAX6oFzFs77qnE8cU=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail cython==3.1.1 cython
+  '';
+
   outputs = [
     "out"
     "dev"
diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix
index 2f448cef5b47..ea110609e84d 100644
--- a/pkgs/development/python-modules/huggingface-hub/default.nix
+++ b/pkgs/development/python-modules/huggingface-hub/default.nix
@@ -15,7 +15,7 @@
   pyyaml,
   shellingham,
   tqdm,
-  typer-slim,
+  typer,
   typing-extensions,
 
   # optional-dependencies
@@ -35,16 +35,21 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "huggingface-hub";
-  version = "1.3.4";
+  version = "1.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "huggingface_hub";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-q6BTpNawUPZ9LWSxJkq/GaLNLdmhAeJehyWVMvdtH24=";
+    hash = "sha256-At3FN+dplQ3L9B4vDZrEvREdwgepUvzWC7yeU6L5XY8=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail "typer-slim" "typer"
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -56,7 +61,7 @@ buildPythonPackage (finalAttrs: {
     pyyaml
     shellingham
     tqdm
-    typer-slim
+    typer
     typing-extensions
   ];
 
diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 67cd68dfc382..19f83ae76045 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.202602171";
+  version = "0.1.202602181";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KunVsdXBzfog3tFxWW5mf20weffCl5sOXaW1sYaAdqc=";
+    hash = "sha256-6HLwpTFTqS3T6VQ9jwr7+wVv8ARLDbh9a/68txWMvJU=";
   };
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/iniparse/default.nix b/pkgs/development/python-modules/iniparse/default.nix
index 18d922c90e48..36efa6761449 100644
--- a/pkgs/development/python-modules/iniparse/default.nix
+++ b/pkgs/development/python-modules/iniparse/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Accessing and Modifying INI files";
     homepage = "https://github.com/candlepin/python-iniparse";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ danbst ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix
index 28f7828f9fa3..a3ba4603fff9 100644
--- a/pkgs/development/python-modules/internetarchive/default.nix
+++ b/pkgs/development/python-modules/internetarchive/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "internetarchive";
-  version = "5.7.2";
+  version = "5.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jjjake";
     repo = "internetarchive";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eBTUKJs3j8LmQJSIBKAlDOjUglLHrjwtGx5O9Wn5C8Y=";
+    hash = "sha256-NiuLnK7OBbM6b1qecOcAmX1k7Z8FBNrJdGr6Vm3r9RU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/litestar/default.nix b/pkgs/development/python-modules/litestar/default.nix
index 946f3d70db2b..b953d0435ea3 100644
--- a/pkgs/development/python-modules/litestar/default.nix
+++ b/pkgs/development/python-modules/litestar/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonAtLeast,
+  pythonOlder,
 
   # build-system
   hatchling,
@@ -10,19 +11,16 @@
   # dependencies
   annotated-types,
   anyio,
-  asyncpg,
   attrs,
   brotli,
   click,
   cryptography,
-  fsspec,
   httpx,
   jinja2,
   jsbeautifier,
   litestar-htmx,
   mako,
   minijinja,
-  fast-query-parsers,
   msgspec,
   multidict,
   multipart,
@@ -30,7 +28,6 @@
   polyfactory,
   piccolo,
   prometheus-client,
-  psutil,
   opentelemetry-instrumentation-asgi,
   pydantic-extra-types,
   pydantic,
@@ -40,11 +37,12 @@
   redis,
   rich-click,
   rich,
+  sniffio,
   structlog,
   time-machine,
   typing-extensions,
   uvicorn,
-  # valkey,
+  valkey,
 
   # tests
   addBinToPathHook,
@@ -76,20 +74,17 @@ buildPythonPackage (finalAttrs: {
 
   dependencies = [
     anyio
-    asyncpg
     click
-    fast-query-parsers
-    fsspec
     httpx
     litestar-htmx
     msgspec
     multidict
     multipart
     polyfactory
-    psutil
     pyyaml
     rich
     rich-click
+    sniffio
     typing-extensions
   ];
 
@@ -100,9 +95,9 @@ buildPythonPackage (finalAttrs: {
     cli = [
       jsbeautifier
       uvicorn
-    ];
+    ]
+    ++ uvicorn.optional-dependencies.standard;
     cryptography = [ cryptography ];
-    htmx = [ litestar-htmx ];
     jinja = [ jinja2 ];
     jwt = [
       cryptography
@@ -112,8 +107,7 @@ buildPythonPackage (finalAttrs: {
     minijinja = [ minijinja ];
     opentelemetry = [ opentelemetry-instrumentation-asgi ];
     piccolo = [ piccolo ];
-    picologging = [ picologging ];
-    polyfactory = [ polyfactory ];
+    picologging = lib.optionals (pythonOlder "3.13") [ picologging ];
     prometheus = [ prometheus-client ];
     pydantic = [
       pydantic
@@ -122,9 +116,14 @@ buildPythonPackage (finalAttrs: {
     ];
     redis = [ redis ] ++ redis.optional-dependencies.hiredis;
     # sqlalchemy = [ advanced-alchemy ];
+    standard = [
+      jinja2
+      jsbeautifier
+      uvicorn
+    ]
+    ++ uvicorn.optional-dependencies.standard;
     structlog = [ structlog ];
-    # valkey = [ valkey ] ++ valkey.optional-dependencies.libvalkey;
-    yaml = [ pyyaml ];
+    valkey = [ valkey ] ++ valkey.optional-dependencies.libvalkey;
   };
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/livekit-api/default.nix b/pkgs/development/python-modules/livekit-api/default.nix
index da538a2a3686..be2c9cac49a0 100644
--- a/pkgs/development/python-modules/livekit-api/default.nix
+++ b/pkgs/development/python-modules/livekit-api/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "livekit-api";
-  version = "1.0.24";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "python-sdks";
-    tag = "rtc-v${version}";
-    hash = "sha256-XtjlKGhz/57NGJ95pKwBE1ylvVXulXsozpTpdbCL1Mk=";
+    tag = "api-v${version}";
+    hash = "sha256-Z9ZyzESPUR+j9s9LXSTDx3pB+bltbqTeb8WVKaKk80A=";
   };
 
   pypaBuildFlags = [ "livekit-api" ];
@@ -47,6 +47,7 @@ buildPythonPackage rec {
   passthru.updateScript = gitUpdater { rev-prefix = "api-v"; };
 
   meta = {
+    changelog = "https://github.com/livekit/python-sdks/releases/tag/${src.tag}";
     description = "LiveKit real-time and server SDKs for Python";
     homepage = "https://github.com/livekit/python-sdks/";
     license = lib.licenses.asl20;
diff --git a/pkgs/development/python-modules/livekit-protocol/default.nix b/pkgs/development/python-modules/livekit-protocol/default.nix
index e65c0962917d..59a23bc78228 100644
--- a/pkgs/development/python-modules/livekit-protocol/default.nix
+++ b/pkgs/development/python-modules/livekit-protocol/default.nix
@@ -2,26 +2,26 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  setuptools,
+  hatchling,
   protobuf,
   gitUpdater,
 }:
 
 buildPythonPackage rec {
   pname = "livekit-protocol";
-  version = "1.1.0";
+  version = "1.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "python-sdks";
     tag = "protocol-v${version}";
-    hash = "sha256-u89KM1Lio1gELIzwhmBJFCf1c29cfGu0WsMf8Vvsi8M=";
+    hash = "sha256-/QXjIz3q5dF6Y1CkyCP+3hWoXMGs7+eUgtehBJBF7LY=";
   };
 
   pypaBuildFlags = [ "livekit-protocol" ];
 
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
   dependencies = [
     protobuf
diff --git a/pkgs/development/python-modules/lm-eval/default.nix b/pkgs/development/python-modules/lm-eval/default.nix
index c1befc184c8d..fb863b2add6f 100644
--- a/pkgs/development/python-modules/lm-eval/default.nix
+++ b/pkgs/development/python-modules/lm-eval/default.nix
@@ -28,7 +28,6 @@
 
   # optional-dependencies
   aiohttp,
-  hf-transfer,
   immutabledict,
   langdetect,
   librosa,
@@ -54,14 +53,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "lm-eval";
-  version = "0.4.10";
+  version = "0.4.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "EleutherAI";
     repo = "lm-evaluation-harness";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+fVLpJ/wzFyQJkdlHTirTNrtWg7Vn26kU0OV4+oDJXA=";
+    hash = "sha256-+zhZ+I+gzoF7g0xYvlPbZFcFy2PuFOgNTFLvbmdE1R0=";
   };
 
   build-system = [
@@ -104,7 +103,6 @@ buildPythonPackage (finalAttrs: {
       torch
       transformers
     ];
-    hf_transfer = [ hf-transfer ];
     ifeval = [
       immutabledict
       langdetect
@@ -133,7 +131,6 @@ buildPythonPackage (finalAttrs: {
     # - math
     # - multilingual
     # - ruler
-    # - sae_lens
     # - sparsify
     # - tasks
     # - unitxt
diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix
index 6444f9e521f3..4e12dbb633bd 100644
--- a/pkgs/development/python-modules/mastodon-py/default.nix
+++ b/pkgs/development/python-modules/mastodon-py/default.nix
@@ -5,6 +5,7 @@
   blurhash,
   cryptography,
   decorator,
+  fetchpatch,
   graphemeu,
   http-ece,
   python-dateutil,
@@ -30,6 +31,14 @@ buildPythonPackage rec {
     hash = "sha256-i3HMT8cabSl664UK3eopJQ9bDBpGCgbHTvBJkgeoxd8=";
   };
 
+  patches = [
+    # Switch dependency from unmaintained `grapheme` to `graphemeu`
+    (fetchpatch {
+      url = "https://github.com/halcy/Mastodon.py/commit/939c7508414e950922c518260a9ba5a5853aeef2.patch";
+      hash = "sha256-XBiAFxYUBNyynld++UwPGIIg9j+3/EF2jGqiysVqYRM=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/md2pdf/default.nix b/pkgs/development/python-modules/md2pdf/default.nix
index 0870c6c31611..ba17df6e1393 100644
--- a/pkgs/development/python-modules/md2pdf/default.nix
+++ b/pkgs/development/python-modules/md2pdf/default.nix
@@ -1,6 +1,5 @@
 {
   buildPythonPackage,
-  click,
   fetchFromGitHub,
   hatchling,
   jinja2,
@@ -8,28 +7,30 @@
   markdown,
   pygments,
   pymdown-extensions,
+  pypdf,
   pytest-cov-stub,
   pytestCheckHook,
   python-frontmatter,
+  typer,
+  watchfiles,
   weasyprint,
 }:
 
 buildPythonPackage rec {
   pname = "md2pdf";
-  version = "2.1.0";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jmaupetit";
     repo = "md2pdf";
     tag = "v${version}";
-    hash = "sha256-oVWUoWIS9GmkNPbJg90diT0jEgOULySSNxNdg95T2Vs=";
+    hash = "sha256-ksccl9K0o0mZleyLe1K1ob78W2MKZksTFtu6/dZUWeg=";
   };
 
   build-system = [ hatchling ];
 
   dependencies = [
-    click
     jinja2
     markdown
     pygments
@@ -38,17 +39,37 @@ buildPythonPackage rec {
     weasyprint
   ];
 
+  optional-dependencies = {
+    cli = [
+      typer
+      watchfiles
+    ];
+    latex = [
+      # FIXME package markdown-latex
+    ];
+  };
+
   pythonImportsCheck = [ "md2pdf" ];
 
   nativeCheckInputs = [
+    pypdf
     pytest-cov-stub
     pytestCheckHook
-  ];
+  ]
+  ++ lib.concatAttrValues optional-dependencies;
 
   preCheck = ''
     export PATH="$out/bin:$PATH"
   '';
 
+  disabledTests = [
+    # AssertionError caused by
+    #     glyph rendered for Unicode string unsupported by fonts: "👋" (U+1F44B)
+    "test_generate_pdf_with_jinja_context_input"
+    "test_generate_pdf_with_jinja_frontmatter_and_context_input"
+    "test_generate_pdf_with_jinja_frontmatter_input"
+  ];
+
   meta = {
     changelog = "https://github.com/jmaupetit/md2pdf/blob/${src.tag}/CHANGELOG.md";
     description = "Markdown to PDF conversion tool";
diff --git a/pkgs/development/python-modules/mlx-lm/default.nix b/pkgs/development/python-modules/mlx-lm/default.nix
index ee539408003c..f1212400dd5e 100644
--- a/pkgs/development/python-modules/mlx-lm/default.nix
+++ b/pkgs/development/python-modules/mlx-lm/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "mlx-lm";
-  version = "0.30.6";
+  version = "0.30.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ml-explore";
     repo = "mlx-lm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DclGHYrCmluS5pn7K/wvN51b2C8i/W8opS4hZ4P/TJk=";
+    hash = "sha256-Jc+JyReOH8Wja8sh9BvOO6X090xutKrVSbv+lEODPls=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/model-bakery/default.nix b/pkgs/development/python-modules/model-bakery/default.nix
index 254d91613461..a8f1cced95c7 100644
--- a/pkgs/development/python-modules/model-bakery/default.nix
+++ b/pkgs/development/python-modules/model-bakery/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "model-bakery";
-  version = "1.23.2";
+  version = "1.23.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "model-bakers";
     repo = "model_bakery";
     tag = finalAttrs.version;
-    hash = "sha256-7RMFbUFYUJI8gI5GVQ6kivjb6oeHGKzYbyTukMjK+8Q=";
+    hash = "sha256-W5n/L5D64OCCZkVi1IFHNl/mIR1EW6PIVuvmM78kq78=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix
index 228f55b547ad..83756a617e41 100644
--- a/pkgs/development/python-modules/msrest/default.nix
+++ b/pkgs/development/python-modules/msrest/default.nix
@@ -1,19 +1,25 @@
 {
   lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonAtLeast,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   aiodns,
   aiohttp,
   azure-core,
-  buildPythonPackage,
   certifi,
-  fetchFromGitHub,
-  httpretty,
   isodate,
-  pytest-aiohttp,
-  pytestCheckHook,
-  pythonAtLeast,
   requests,
   requests-oauthlib,
-  setuptools,
+
+  # tests
+  pytestCheckHook,
+  pytest-aiohttp,
+  httpretty,
   trio,
 }:
 
@@ -25,17 +31,18 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "msrest-for-python";
-    # no tag for 0.7.1
+    # no tag for 0.7.1 see:
+    # https://github.com/Azure/msrest-for-python/issues/254
     rev = "2d8fd04f68a124d0f3df7b81584accc3270b1afc";
     hash = "sha256-1EXXXflhDeU+erdI+NsWxSX76ooDTl3+MyQwRzm2xV0=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
-    azure-core
+  dependencies = [
     aiodns
     aiohttp
+    azure-core
     certifi
     isodate
     requests
@@ -60,13 +67,23 @@ buildPythonPackage {
     "test_conf_async_trio_requests"
   ]
   ++ lib.optionals (pythonAtLeast "3.12") [
-    # AttributeError: 'TestAuthentication' object has no attribute...
+    # See https://github.com/Azure/msrest-for-python/issues/261
+    # Upstream ignores the following patch that should fix it:
+    # https://github.com/Azure/msrest-for-python/pull/262
+    # And it doesn't apply anymore.
     "test_apikey_auth"
     "test_cs_auth"
     "test_eventgrid_auth"
     "test_eventgrid_domain_auth"
   ];
 
+  disabledTestPaths = [
+    # 2 AssertionErrors... See:
+    # https://github.com/Azure/msrest-for-python/issues/267
+    "tests/asynctests/test_async_client.py::TestServiceClient::test_client_send"
+    "tests/test_client.py::TestServiceClient::test_client_send"
+  ];
+
   pythonImportsCheck = [ "msrest" ];
 
   meta = {
diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d4cb14950816..35b793e90593 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -443,16 +443,16 @@ in
       "sha256-92qhSUqTiLgbtvCdi/Mmgve18mcYR00ABL+bNy7/OnY=";
 
   mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.42.49"
-      "sha256-HN4TRMVlleWZuhYnuTPxFz1bxP3KIdmchROom9g5jWM=";
+    buildMypyBoto3Package "ec2" "1.42.51"
+      "sha256-yeQ1LX3GmyIyhwmXwFqft35S6DiMM4KtMKOJMKgLbSo=";
 
   mypy-boto3-ec2-instance-connect =
     buildMypyBoto3Package "ec2-instance-connect" "1.42.3"
       "sha256-qe5aitxIPiQA2Et/+MtGVsnmWvk45Rg04/U/kR+tmK0=";
 
   mypy-boto3-ecr =
-    buildMypyBoto3Package "ecr" "1.42.13"
-      "sha256-xVHgtAQXAv3T1RnBAk47FmH138wvagdvSxUgwUO0s/A=";
+    buildMypyBoto3Package "ecr" "1.42.50"
+      "sha256-NHp+LO9C6U+mFEpoNyE/a4zalfJ5g0w18tQ3ONoe1WM=";
 
   mypy-boto3-ecr-public =
     buildMypyBoto3Package "ecr-public" "1.42.3"
@@ -574,8 +574,8 @@ in
     buildMypyBoto3Package "glue" "1.42.43"
       "sha256-PBFrSU7QbOuaU5kWjYe6eA8k9BHdAZUuD3jMYLlFwF0=";
   mypy-boto3-grafana =
-    buildMypyBoto3Package "grafana" "1.42.3"
-      "sha256-wVeFhJIXV8wFQpCizH8IUh6JAFg+S67aTR60dqWk/3M=";
+    buildMypyBoto3Package "grafana" "1.42.51"
+      "sha256-QHAuRJrioMD7ASgV1Wobm81Gb+Z87c78yBs9X1+Kz+E=";
 
   mypy-boto3-greengrass =
     buildMypyBoto3Package "greengrass" "1.42.3"
@@ -706,8 +706,8 @@ in
       "sha256-eAzIwmz5eZKf2NBGSMw4NopdHqAR5TcF9/0KQqVWr0s=";
 
   mypy-boto3-kafka =
-    buildMypyBoto3Package "kafka" "1.42.46"
-      "sha256-XfZloR5nG1xGyAb4D1UsDpH1xc2hKoBCWabS+yc+uO8=";
+    buildMypyBoto3Package "kafka" "1.42.50"
+      "sha256-gk11rWTYlKHL+PjZvUy+8ZRNHcwC7clIiynVg0EPt8U=";
 
   mypy-boto3-kafkaconnect =
     buildMypyBoto3Package "kafkaconnect" "1.42.47"
@@ -758,8 +758,8 @@ in
       "sha256-x9ntwcOhUm5Hsd/L+O5N77xJ/NWxgQhNVdtaaShM7p8=";
 
   mypy-boto3-kms =
-    buildMypyBoto3Package "kms" "1.42.3"
-      "sha256-UfEbkTcu9ecQoqoXbM6uWxNAh5B/Z6Wj26WHSaLiEj8=";
+    buildMypyBoto3Package "kms" "1.42.50"
+      "sha256-bCVvuhK3mpTeNDYDYaACVWgQMhKR9mIi9BbbCI0ynCA=";
 
   mypy-boto3-lakeformation =
     buildMypyBoto3Package "lakeformation" "1.42.45"
@@ -1082,8 +1082,8 @@ in
       "sha256-55wnvv8vd/G5KdZoJipaSLzC13wRoop7ZXwTLDU4GtE=";
 
   mypy-boto3-rds =
-    buildMypyBoto3Package "rds" "1.42.46"
-      "sha256-sryN4eFwReg8h2lq2+vOmfqRTRUNttsMXt99anq4oFM=";
+    buildMypyBoto3Package "rds" "1.42.51"
+      "sha256-0J0M9QcOtRrIrtrLY1lNaJ/ownmhyDbfvQanFMqsi94=";
 
   mypy-boto3-rds-data =
     buildMypyBoto3Package "rds-data" "1.42.3"
@@ -1426,8 +1426,8 @@ in
       "sha256-uZ/xdc5xCp0Kb+5LlHGEyo+iBB1iWB7Jo9szx+aY4SQ=";
 
   mypy-boto3-workspaces-web =
-    buildMypyBoto3Package "workspaces-web" "1.42.42"
-      "sha256-FHSL5KRc6cvB+vv/K/09WH7uvGE+2lJ17X1lduIOdzM=";
+    buildMypyBoto3Package "workspaces-web" "1.42.51"
+      "sha256-1LoVLQsBJnWfTwVi9F4kJjZhFWq71/uZPDDV7az9xGI=";
 
   mypy-boto3-xray =
     buildMypyBoto3Package "xray" "1.42.3"
diff --git a/pkgs/development/python-modules/nicegui-highcharts/default.nix b/pkgs/development/python-modules/nicegui-highcharts/default.nix
index 592a43d467c9..bd78ac6d19b5 100644
--- a/pkgs/development/python-modules/nicegui-highcharts/default.nix
+++ b/pkgs/development/python-modules/nicegui-highcharts/default.nix
@@ -1,43 +1,27 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  poetry-core,
-  setuptools,
-
-  # dependencies
   docutils,
+  fetchFromGitHub,
   nicegui,
+  hatchling,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "nicegui-highcharts";
-  version = "3.1.0";
+  version = "3.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zauberzeug";
     repo = "nicegui-highcharts";
-    tag = "v${version}";
-    hash = "sha256-xfZtEAwHIbSI55V9GR9E1c2bbC+RQFiBW9zZ1f3e+vk=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ihPWk/FnOAJzO3kWM4dV0ZbbDgBfGb4o+6zkVEb6wrA=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools>=30.3.0,<50" "setuptools"
-  '';
+  pythonRelaxDeps = [ "docutils" ];
 
-  pythonRelaxDeps = [
-    "docutils"
-    "nicegui"
-  ];
-
-  build-system = [
-    poetry-core
-    setuptools
-  ];
+  build-system = [ hatchling ];
 
   dependencies = [
     docutils
@@ -52,8 +36,8 @@ buildPythonPackage rec {
   meta = {
     description = "NiceGUI with support for Highcharts";
     homepage = "https://github.com/zauberzeug/nicegui-highcharts";
-    changelog = "https://github.com/zauberzeug/nicegui-highcharts/releases/tag/v${version}";
+    changelog = "https://github.com/zauberzeug/nicegui-highcharts/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix
index 7a648566bc30..8081bd64140a 100644
--- a/pkgs/development/python-modules/ocrmypdf/default.nix
+++ b/pkgs/development/python-modules/ocrmypdf/default.nix
@@ -32,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "ocrmypdf";
-  version = "17.0.1";
+  version = "17.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm "$out/.git_archival.txt"
     '';
-    hash = "sha256-wqauXBdy5kCCsuuM+3HKztl2jqwzF4BNFvYUElRzFm0=";
+    hash = "sha256-MlsrssmuEzFXy+N6kWjkF3wtcDCncjYmAi43PUeYuJg=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/ocrmypdf/paths.patch b/pkgs/development/python-modules/ocrmypdf/paths.patch
index db61e5bd328b..164b7f66a4dc 100644
--- a/pkgs/development/python-modules/ocrmypdf/paths.patch
+++ b/pkgs/development/python-modules/ocrmypdf/paths.patch
@@ -1,8 +1,8 @@
 diff --git a/src/ocrmypdf/_exec/ghostscript.py b/src/ocrmypdf/_exec/ghostscript.py
-index b48f2080..beabcf4b 100644
+index eaa48117..30201d97 100644
 --- a/src/ocrmypdf/_exec/ghostscript.py
 +++ b/src/ocrmypdf/_exec/ghostscript.py
-@@ -35,7 +35,7 @@ COLOR_CONVERSION_STRATEGIES = frozenset(
+@@ -31,7 +31,7 @@ COLOR_CONVERSION_STRATEGIES = frozenset(
      ]
  )
  # Ghostscript executable - gswin32c is not supported
@@ -12,7 +12,7 @@ index b48f2080..beabcf4b 100644
  
  log = logging.getLogger(__name__)
 diff --git a/src/ocrmypdf/_exec/jbig2enc.py b/src/ocrmypdf/_exec/jbig2enc.py
-index 736de67e..d8c24ebd 100644
+index 1c6dd5fe..b689a091 100644
 --- a/src/ocrmypdf/_exec/jbig2enc.py
 +++ b/src/ocrmypdf/_exec/jbig2enc.py
 @@ -15,7 +15,7 @@ from ocrmypdf.subprocess import get_version, run
@@ -24,7 +24,16 @@ index 736de67e..d8c24ebd 100644
      except CalledProcessError as e:
          # TeX Live for Windows provides an incompatible jbig2.EXE which may
          # be on the PATH.
-@@ -32,7 +32,7 @@ def available():
+@@ -33,7 +33,7 @@ def available():
+ 
+ def convert_group(cwd, infiles, out_prefix, threshold):
+     args = [
+-        'jbig2',
++        '@jbig2@',
+         '-b',
+         out_prefix,
+         '--symbol-mode',  # symbol mode (lossy)
+@@ -50,7 +50,7 @@ def convert_group(cwd, infiles, out_prefix, threshold):
  
  
  def convert_single(cwd, infile, outfile, threshold):
@@ -56,10 +65,10 @@ index 5b8600d0..fcad771b 100644
              '--skip-if-larger',
              '--quality',
 diff --git a/src/ocrmypdf/_exec/tesseract.py b/src/ocrmypdf/_exec/tesseract.py
-index d41a0af7..b189b0de 100644
+index 102bdab8..bfef4400 100644
 --- a/src/ocrmypdf/_exec/tesseract.py
 +++ b/src/ocrmypdf/_exec/tesseract.py
-@@ -116,7 +116,7 @@ class TesseractVersion(Version):
+@@ -95,7 +95,7 @@ class TesseractVersion(Version):
  
  
  def version() -> Version:
@@ -68,7 +77,7 @@ index d41a0af7..b189b0de 100644
  
  
  def has_thresholding() -> bool:
-@@ -134,7 +134,7 @@ def get_languages() -> set[str]:
+@@ -113,7 +113,7 @@ def get_languages() -> set[str]:
          msg += output
          return msg
  
@@ -77,7 +86,7 @@ index d41a0af7..b189b0de 100644
      try:
          proc = run(
              args_tess,
-@@ -156,7 +156,7 @@ def get_languages() -> set[str]:
+@@ -135,7 +135,7 @@ def get_languages() -> set[str]:
  
  
  def tess_base_args(langs: list[str], engine_mode: int | None) -> list[str]:
diff --git a/pkgs/development/python-modules/ocrmypdf_16/default.nix b/pkgs/development/python-modules/ocrmypdf_16/default.nix
new file mode 100644
index 000000000000..a700f0bd8358
--- /dev/null
+++ b/pkgs/development/python-modules/ocrmypdf_16/default.nix
@@ -0,0 +1,113 @@
+{
+  lib,
+  buildPythonPackage,
+  deprecation,
+  fetchFromGitHub,
+  fpdf2,
+  ghostscript_headless,
+  hatch-vcs,
+  hatchling,
+  hypothesis,
+  img2pdf,
+  jbig2enc,
+  packaging,
+  pdfminer-six,
+  pillow-heif,
+  pikepdf,
+  pillow,
+  pluggy,
+  pngquant,
+  pydantic,
+  pypdfium2,
+  pytest-xdist,
+  pytestCheckHook,
+  rich,
+  reportlab,
+  replaceVars,
+  tesseract,
+  uharfbuzz,
+  unpaper,
+  installShellFiles,
+}:
+
+buildPythonPackage rec {
+  pname = "ocrmypdf";
+  version = "16.13.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ocrmypdf";
+    repo = "OCRmyPDF";
+    tag = "v${version}";
+    # The content of .git_archival.txt is substituted upon tarball creation,
+    # which creates indeterminism if master no longer points to the tag.
+    # See https://github.com/ocrmypdf/OCRmyPDF/issues/841
+    postFetch = ''
+      rm "$out/.git_archival.txt"
+    '';
+    hash = "sha256-xxVtncIQ72echi0VogfgqwfB8IA7JEKVUV2lmL1coeU=";
+  };
+
+  patches = [
+    ./use-pillow-heif.patch
+    (replaceVars ./paths.patch {
+      gs = lib.getExe ghostscript_headless;
+      jbig2 = lib.getExe jbig2enc;
+      pngquant = lib.getExe pngquant;
+      tesseract = lib.getExe tesseract;
+      unpaper = lib.getExe unpaper;
+    })
+  ];
+
+  build-system = [
+    hatch-vcs
+    hatchling
+  ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  dependencies = [
+    deprecation
+    fpdf2
+    img2pdf
+    packaging
+    pdfminer-six
+    pillow-heif
+    pikepdf
+    pillow
+    pluggy
+    pydantic
+    pypdfium2
+    rich
+    uharfbuzz
+  ];
+
+  nativeCheckInputs = [
+    hypothesis
+    pytest-xdist
+    pytestCheckHook
+    reportlab
+  ];
+
+  pythonImportsCheck = [ "ocrmypdf" ];
+
+  postInstall = ''
+    installShellCompletion --cmd ocrmypdf \
+      --bash misc/completion/ocrmypdf.bash \
+      --fish misc/completion/ocrmypdf.fish
+  '';
+
+  meta = {
+    homepage = "https://github.com/ocrmypdf/OCRmyPDF";
+    description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched";
+    license = with lib.licenses; [
+      mpl20
+      mit
+    ];
+    maintainers = with lib.maintainers; [
+      dotlambda
+    ];
+    changelog = "https://github.com/ocrmypdf/OCRmyPDF/blob/${src.tag}/docs/release_notes.md";
+    mainProgram = "ocrmypdf";
+  };
+}
diff --git a/pkgs/development/python-modules/ocrmypdf_16/paths.patch b/pkgs/development/python-modules/ocrmypdf_16/paths.patch
new file mode 100644
index 000000000000..164b7f66a4dc
--- /dev/null
+++ b/pkgs/development/python-modules/ocrmypdf_16/paths.patch
@@ -0,0 +1,119 @@
+diff --git a/src/ocrmypdf/_exec/ghostscript.py b/src/ocrmypdf/_exec/ghostscript.py
+index eaa48117..30201d97 100644
+--- a/src/ocrmypdf/_exec/ghostscript.py
++++ b/src/ocrmypdf/_exec/ghostscript.py
+@@ -31,7 +31,7 @@ COLOR_CONVERSION_STRATEGIES = frozenset(
+     ]
+ )
+ # Ghostscript executable - gswin32c is not supported
+-GS = 'gswin64c' if os.name == 'nt' else 'gs'
++GS = '@gs@'
+ 
+ 
+ log = logging.getLogger(__name__)
+diff --git a/src/ocrmypdf/_exec/jbig2enc.py b/src/ocrmypdf/_exec/jbig2enc.py
+index 1c6dd5fe..b689a091 100644
+--- a/src/ocrmypdf/_exec/jbig2enc.py
++++ b/src/ocrmypdf/_exec/jbig2enc.py
+@@ -15,7 +15,7 @@ from ocrmypdf.subprocess import get_version, run
+ 
+ def version() -> Version:
+     try:
+-        version = get_version('jbig2', regex=r'jbig2enc (\d+(\.\d+)*).*')
++        version = get_version('@jbig2@', regex=r'jbig2enc (\d+(\.\d+)*).*')
+     except CalledProcessError as e:
+         # TeX Live for Windows provides an incompatible jbig2.EXE which may
+         # be on the PATH.
+@@ -33,7 +33,7 @@ def available():
+ 
+ def convert_group(cwd, infiles, out_prefix, threshold):
+     args = [
+-        'jbig2',
++        '@jbig2@',
+         '-b',
+         out_prefix,
+         '--symbol-mode',  # symbol mode (lossy)
+@@ -50,7 +50,7 @@ def convert_group(cwd, infiles, out_prefix, threshold):
+ 
+ 
+ def convert_single(cwd, infile, outfile, threshold):
+-    args = ['jbig2', '--pdf', '-t', str(threshold), infile]
++    args = ['@jbig2@', '--pdf', '-t', str(threshold), infile]
+     with open(outfile, 'wb') as fstdout:
+         proc = run(args, cwd=cwd, stdout=fstdout, stderr=PIPE)
+     proc.check_returncode()
+diff --git a/src/ocrmypdf/_exec/pngquant.py b/src/ocrmypdf/_exec/pngquant.py
+index 5b8600d0..fcad771b 100644
+--- a/src/ocrmypdf/_exec/pngquant.py
++++ b/src/ocrmypdf/_exec/pngquant.py
+@@ -15,7 +15,7 @@ from ocrmypdf.subprocess import get_version, run
+ 
+ 
+ def version() -> Version:
+-    return Version(get_version('pngquant', regex=r'(\d+(\.\d+)*).*'))
++    return Version(get_version('@pngquant@', regex=r'(\d+(\.\d+)*).*'))
+ 
+ 
+ def available():
+@@ -37,7 +37,7 @@ def quantize(input_file: Path, output_file: Path, quality_min: int, quality_max:
+     """
+     with open(input_file, 'rb') as input_stream:
+         args = [
+-            'pngquant',
++            '@pngquant@',
+             '--force',
+             '--skip-if-larger',
+             '--quality',
+diff --git a/src/ocrmypdf/_exec/tesseract.py b/src/ocrmypdf/_exec/tesseract.py
+index 102bdab8..bfef4400 100644
+--- a/src/ocrmypdf/_exec/tesseract.py
++++ b/src/ocrmypdf/_exec/tesseract.py
+@@ -95,7 +95,7 @@ class TesseractVersion(Version):
+ 
+ 
+ def version() -> Version:
+-    return TesseractVersion(get_version('tesseract', regex=r'tesseract\s(.+)'))
++    return TesseractVersion(get_version('@tesseract@', regex=r'tesseract\s(.+)'))
+ 
+ 
+ def has_thresholding() -> bool:
+@@ -113,7 +113,7 @@ def get_languages() -> set[str]:
+         msg += output
+         return msg
+ 
+-    args_tess = ['tesseract', '--list-langs']
++    args_tess = ['@tesseract@', '--list-langs']
+     try:
+         proc = run(
+             args_tess,
+@@ -135,7 +135,7 @@ def get_languages() -> set[str]:
+ 
+ 
+ def tess_base_args(langs: list[str], engine_mode: int | None) -> list[str]:
+-    args = ['tesseract']
++    args = ['@tesseract@']
+     if langs:
+         args.extend(['-l', '+'.join(langs)])
+     if engine_mode is not None:
+diff --git a/src/ocrmypdf/_exec/unpaper.py b/src/ocrmypdf/_exec/unpaper.py
+index a5a92f4c..6cf56eb3 100644
+--- a/src/ocrmypdf/_exec/unpaper.py
++++ b/src/ocrmypdf/_exec/unpaper.py
+@@ -48,7 +48,7 @@ class UnpaperImageTooLargeError(Exception):
+ 
+ 
+ def version() -> Version:
+-    return Version(get_version('unpaper', regex=r'(?m).*?(\d+(\.\d+)(\.\d+)?)'))
++    return Version(get_version('@unpaper@', regex=r'(?m).*?(\d+(\.\d+)(\.\d+)?)'))
+ 
+ 
+ @contextmanager
+@@ -70,7 +70,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[tuple[Path, Path, Path]]:
+ def run_unpaper(
+     input_file: Path, output_file: Path, *, dpi: DecFloat, mode_args: list[str]
+ ) -> None:
+-    args_unpaper = ['unpaper', '-v', '--dpi', str(round(dpi, 6))] + mode_args
++    args_unpaper = ['@unpaper@', '-v', '--dpi', str(round(dpi, 6))] + mode_args
+ 
+     with _setup_unpaper_io(input_file) as (input_png, output_pnm, tmpdir):
+         # To prevent any shenanigans from accepting arbitrary parameters in
diff --git a/pkgs/development/python-modules/ocrmypdf_16/use-pillow-heif.patch b/pkgs/development/python-modules/ocrmypdf_16/use-pillow-heif.patch
new file mode 100644
index 000000000000..0137ea02453d
--- /dev/null
+++ b/pkgs/development/python-modules/ocrmypdf_16/use-pillow-heif.patch
@@ -0,0 +1,26 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 2caa0e75..f6fcf60a 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -16,7 +16,7 @@ dependencies = [
+   "img2pdf>=0.5",
+   "packaging>=20",
+   "pdfminer.six>=20220319",
+-  "pi-heif",                # Heif image format - maintainers: if this is removed, it will NOT break
++  "pillow-heif",                # Heif image format - maintainers: if this is removed, it will NOT break
+   "pikepdf>=10",
+   "Pillow>=10.0.1",
+   "pluggy>=1",
+diff --git a/src/ocrmypdf/_pipeline.py b/src/ocrmypdf/_pipeline.py
+index 90524d58..0be5a0f8 100644
+--- a/src/ocrmypdf/_pipeline.py
++++ b/src/ocrmypdf/_pipeline.py
+@@ -42,7 +42,7 @@ from ocrmypdf.pdfinfo import Colorspace, Encoding, PageInfo, PdfInfo
+ from ocrmypdf.pluginspec import OrientationConfidence
+ 
+ try:
+-    from pi_heif import register_heif_opener
++    from pillow_heif import register_heif_opener
+ except ImportError:
+ 
+     def register_heif_opener():
diff --git a/pkgs/development/python-modules/odc-geo/default.nix b/pkgs/development/python-modules/odc-geo/default.nix
index 9944d6cf3a92..1f14b41b9219 100644
--- a/pkgs/development/python-modules/odc-geo/default.nix
+++ b/pkgs/development/python-modules/odc-geo/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   # build-system
-  setuptools,
+  flit-core,
 
   # dependencies
   affine,
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   };
 
   build-system = [
-    setuptools
+    flit-core
   ];
 
   dependencies = [
@@ -96,6 +96,8 @@ buildPythonPackage rec {
     "test_warp_nan"
     # requires imagecodecs package (currently not available on nixpkgs)
     "test_cog_with_dask_smoke_test"
+    # xarray compat issue
+    "test_xr_reproject"
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix
index 645dcca9dd8a..b4ffbdd52c10 100644
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@@ -51,14 +51,14 @@
 
 buildPythonPackage rec {
   pname = "openai";
-  version = "2.15.0";
+  version = "2.21.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "openai-python";
     tag = "v${version}";
-    hash = "sha256-FmOmWtkp+Pe3pICi0uvzsb1nsP4M4yc/34U3Bd2q/KE=";
+    hash = "sha256-Pe9Odm/0tHnXigu9Ix2EYrb9ttMjF3itvXFLlpiOM98=";
   };
 
   postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"'';
diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix
index 5c2dbb3dab69..23c3cde1767d 100644
--- a/pkgs/development/python-modules/parfive/default.nix
+++ b/pkgs/development/python-modules/parfive/default.nix
@@ -23,21 +23,16 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "parfive";
-  version = "2.2.0";
+  version = "2.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Cadair";
     repo = "parfive";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DIjS2q/SOrnLspomLHk8ZJ+krdzMyQfbIpXxad30s1k=";
+    hash = "sha256-i9B860A27KDUJKlE/eQNiGVPEPvnmvmNqMjjdOeBcyY=";
   };
 
-  patches = [
-    # SyntaxError: 'return' in a 'finally' block
-    ./fix-python-3-14-compat.patch
-  ];
-
   build-system = [ setuptools-scm ];
 
   dependencies = [
@@ -57,11 +52,17 @@ buildPythonPackage (finalAttrs: {
     pytestCheckHook
   ];
 
+  pytestFlags = [
+    # https://github.com/Cadair/parfive/issues/65
+    "-Wignore::ResourceWarning"
+  ];
+
   disabledTests = [
     # Requires network access
     "test_ftp"
     "test_ftp_pasv_command"
     "test_ftp_http"
+    "test_problematic_http_urls"
 
     # flaky comparison between runtime types
     "test_http_callback_fail"
diff --git a/pkgs/development/python-modules/parfive/fix-python-3-14-compat.patch b/pkgs/development/python-modules/parfive/fix-python-3-14-compat.patch
deleted file mode 100644
index c4be169bf6dd..000000000000
--- a/pkgs/development/python-modules/parfive/fix-python-3-14-compat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/parfive/downloader.py b/parfive/downloader.py
-index 7a4116b..370ea78 100644
---- a/parfive/downloader.py
-+++ b/parfive/downloader.py
-@@ -317,8 +317,7 @@ class Downloader:
-                     task.cancel()
-                 dl_results = await asyncio.gather(*tasks, return_exceptions=True)
- 
--            finally:
--                return self._format_results(dl_results, main_pb)
-+            return self._format_results(dl_results, main_pb)
- 
-     def _format_results(self, retvals, main_pb):
-         # Squash all nested lists into a single flat list
diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix
index 1b523a71e4ab..d1048ca94524 100644
--- a/pkgs/development/python-modules/pglast/default.nix
+++ b/pkgs/development/python-modules/pglast/default.nix
@@ -1,9 +1,10 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  cython,
+  fetchFromGitHub,
   pytest-cov-stub,
-  pytest,
+  pytestCheckHook,
   setuptools,
 }:
 
@@ -12,24 +13,33 @@ buildPythonPackage rec {
   version = "7.11";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-d67Xi7eMDlbxaaQYM/b9x85jqjgwuMdx/CYxBaiDR0U=";
+  src = fetchFromGitHub {
+    owner = "lelit";
+    repo = "pglast";
+    tag = "v${version}";
+    fetchSubmodules = true;
+    hash = "sha256-b8NrgfPhneERu3kXrrLmhGUSmcnz44SUuv3tBvZ55rE=";
   };
 
-  build-system = [ setuptools ];
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail cython==3.2.3 cython \
+      --replace-fail setuptools==80.9.0 setuptools
+  '';
 
-  dependencies = [ setuptools ];
+  build-system = [
+    cython
+    setuptools
+  ];
 
   nativeCheckInputs = [
-    pytest
+    pytestCheckHook
     pytest-cov-stub
   ];
 
-  # pytestCheckHook doesn't work
-  # ImportError: cannot import name 'parse_sql' from 'pglast'
-  checkPhase = ''
-    pytest
+  preCheck = ''
+    # import from $out
+    rm -r pglast
   '';
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix
index ccc3845e16e4..a3b790027e75 100644
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/pkgs/development/python-modules/pikepdf/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "pikepdf";
-  version = "10.2.0";
+  version = "10.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm "$out/.git_archival.txt"
     '';
-    hash = "sha256-igsZZsYfuR3HR40bbvA9ucKhwqO8Gf1S8aAl2hD1nGY=";
+    hash = "sha256-fEIzmC17RYic4CFwBh5FdGbJmaWaiaPBK7eCQ7RCmr0=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix
index f877a8cd4e67..021393718212 100644
--- a/pkgs/development/python-modules/psycopg/default.nix
+++ b/pkgs/development/python-modules/psycopg/default.nix
@@ -32,14 +32,14 @@
 
 let
   pname = "psycopg";
-  version = "3.3.2";
+  version = "3.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "psycopg";
     repo = "psycopg";
     tag = version;
-    hash = "sha256-ynzXQkTnCCkJK3EZrGHSpzgMeeX92U6+08m8QtNfAc4=";
+    hash = "sha256-hWiclfvimp6WldcDQPx7RFLx+XYRR9wPagAe0oZg7Pw=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index bd6d7ae226e1..1676615e03ce 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "publicsuffixlist";
-  version = "1.0.2.20260211";
+  version = "1.0.2.20260218";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-GNa+6TzEoy2G4xhCvl6lm9WvdDs0e4HAZPF6oBCc4PM=";
+    hash = "sha256-Z03vycoK1WhmbjW5ux/KYVYKC876h6tr7D+h0lnKDPE=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pyannote-metrics/default.nix b/pkgs/development/python-modules/pyannote-metrics/default.nix
index 1a62250667d8..e4242aad2130 100644
--- a/pkgs/development/python-modules/pyannote-metrics/default.nix
+++ b/pkgs/development/python-modules/pyannote-metrics/default.nix
@@ -17,6 +17,7 @@
   # undeclared cli dependencies
   docopt,
   tabulate,
+  typing-extensions,
 
   # tests
   pytestCheckHook,
@@ -57,6 +58,8 @@ buildPythonPackage rec {
     # Imported in pyannote/metrics/cli.py
     docopt
     tabulate
+    # Imporrted in pyannote/metrics/types.py
+    typing-extensions
   ];
 
   pythonImportsCheck = [ "pyannote.metrics" ];
diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix
index a22252ebe71f..7f79ea691594 100644
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyexploitdb";
-  version = "0.3.13";
+  version = "0.3.14";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-fZCdH29PGU8GSo+JHWLqiaJj5zWIDmxTQTSf0UbLdmo=";
+    hash = "sha256-oxva2MJp/7D9apgKLMampKrSMBnBtOxKESRvH24U8DQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyobjc-core/default.nix b/pkgs/development/python-modules/pyobjc-core/default.nix
index 6b70120c077f..e07a01289f74 100644
--- a/pkgs/development/python-modules/pyobjc-core/default.nix
+++ b/pkgs/development/python-modules/pyobjc-core/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pyobjc-core";
-  version = "12.1";
+  version = "11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ronaldoussoren";
     repo = "pyobjc";
     tag = "v${version}";
-    hash = "sha256-mKrn8p6zP53sGCpFjBEWqGNx5MVXcE9x9nlTrzTdPBM=";
+    hash = "sha256-2qPGJ/1hXf3k8AqVLr02fVIM9ziVG9NMrm3hN1de1Us=";
   };
 
   sourceRoot = "${src.name}/pyobjc-core";
diff --git a/pkgs/development/python-modules/pyobjc-framework-Quartz/default.nix b/pkgs/development/python-modules/pyobjc-framework-Quartz/default.nix
index ee4d328f8398..0c238cbb69d0 100644
--- a/pkgs/development/python-modules/pyobjc-framework-Quartz/default.nix
+++ b/pkgs/development/python-modules/pyobjc-framework-Quartz/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pyobjc-framework-Quartz";
-  version = "12.1";
+  version = "11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ronaldoussoren";
     repo = "pyobjc";
     tag = "v${version}";
-    hash = "sha256-mKrn8p6zP53sGCpFjBEWqGNx5MVXcE9x9nlTrzTdPBM=";
+    hash = "sha256-2qPGJ/1hXf3k8AqVLr02fVIM9ziVG9NMrm3hN1de1Us=";
   };
 
   sourceRoot = "${src.name}/pyobjc-framework-Quartz";
diff --git a/pkgs/development/python-modules/pyobjc-framework-Security/default.nix b/pkgs/development/python-modules/pyobjc-framework-Security/default.nix
index 2860a0b0fee6..8209ff78bd8d 100644
--- a/pkgs/development/python-modules/pyobjc-framework-Security/default.nix
+++ b/pkgs/development/python-modules/pyobjc-framework-Security/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pyobjc-framework-Security";
-  version = "12.1";
+  version = "11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ronaldoussoren";
     repo = "pyobjc";
     tag = "v${version}";
-    hash = "sha256-mKrn8p6zP53sGCpFjBEWqGNx5MVXcE9x9nlTrzTdPBM=";
+    hash = "sha256-2qPGJ/1hXf3k8AqVLr02fVIM9ziVG9NMrm3hN1de1Us=";
   };
 
   sourceRoot = "${src.name}/pyobjc-framework-Security";
diff --git a/pkgs/development/python-modules/pyobjc-framework-WebKit/default.nix b/pkgs/development/python-modules/pyobjc-framework-WebKit/default.nix
index a31db7779b49..9e466395e469 100644
--- a/pkgs/development/python-modules/pyobjc-framework-WebKit/default.nix
+++ b/pkgs/development/python-modules/pyobjc-framework-WebKit/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pyobjc-framework-WebKit";
-  version = "12.1";
+  version = "11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ronaldoussoren";
     repo = "pyobjc";
     tag = "v${version}";
-    hash = "sha256-mKrn8p6zP53sGCpFjBEWqGNx5MVXcE9x9nlTrzTdPBM=";
+    hash = "sha256-2qPGJ/1hXf3k8AqVLr02fVIM9ziVG9NMrm3hN1de1Us=";
   };
 
   sourceRoot = "${src.name}/pyobjc-framework-WebKit";
diff --git a/pkgs/development/python-modules/pypdfium2/default.nix b/pkgs/development/python-modules/pypdfium2/default.nix
index d75e17abb52d..b3c7a3837f9c 100644
--- a/pkgs/development/python-modules/pypdfium2/default.nix
+++ b/pkgs/development/python-modules/pypdfium2/default.nix
@@ -36,14 +36,14 @@ let
 in
 buildPythonPackage rec {
   pname = "pypdfium2";
-  version = "5.3.0";
+  version = "5.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pypdfium2-team";
     repo = "pypdfium2";
     tag = version;
-    hash = "sha256-HXJv7GCb+r1rE9Jh0wHm/LCfr8eHJA7qtCk0YhbE+24=";
+    hash = "sha256-QO2q1KNfFtubcJOXZaSfN30Udo14LKwVq8JqD/GOhao=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pyporscheconnectapi/default.nix b/pkgs/development/python-modules/pyporscheconnectapi/default.nix
index f264fccdb906..95bb88bb0ba0 100644
--- a/pkgs/development/python-modules/pyporscheconnectapi/default.nix
+++ b/pkgs/development/python-modules/pyporscheconnectapi/default.nix
@@ -8,16 +8,16 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pyporscheconnectapi";
-  version = "0.2.5";
+  version = "0.2.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CJNE";
     repo = "pyporscheconnectapi";
-    tag = version;
-    hash = "sha256-uB8dbAWoHUWuvWyUhPV1P2wPH/ZzVX22PJNEiDYoOA4=";
+    tag = finalAttrs.version;
+    hash = "sha256-aiNCT1IYSXdlJfIoQsBnVn9FGHifkI8e35VCQGGAAZ0=";
   };
 
   postPatch = ''
@@ -41,8 +41,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python client library for Porsche Connect API";
     homepage = "https://github.com/CJNE/pyporscheconnectapi";
-    changelog = "https://github.com/CJNE/pyporscheconnectapi/releases/tag/${src.tag}";
+    changelog = "https://github.com/CJNE/pyporscheconnectapi/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix
deleted file mode 100644
index e9f46606b9fd..000000000000
--- a/pkgs/development/python-modules/pyrr/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  multipledispatch,
-  numpy,
-}:
-
-buildPythonPackage {
-  pname = "pyrr";
-  version = "unstable-2022-07-22";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "adamlwgriffiths";
-    repo = "Pyrr";
-    rev = "f6c8698c48a75f3fb7ad0d47d0ce80a04f87ba2f";
-    hash = "sha256-u9O52MQskZRzw0rBH6uPdXdikWLJe7wyBZGNKIFA4BA=";
-  };
-
-  propagatedBuildInputs = [
-    multipledispatch
-    numpy
-  ];
-
-  meta = {
-    description = "3D mathematical functions using NumPy";
-    homepage = "https://github.com/adamlwgriffiths/Pyrr/";
-    license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ c0deaddict ];
-  };
-}
diff --git a/pkgs/development/python-modules/pytest-describe/default.nix b/pkgs/development/python-modules/pytest-describe/default.nix
index 7259cb1aafbe..3c88f2f6f66b 100644
--- a/pkgs/development/python-modules/pytest-describe/default.nix
+++ b/pkgs/development/python-modules/pytest-describe/default.nix
@@ -28,6 +28,11 @@ buildPythonPackage {
     hash = "sha256-ygrZwd1cO9arekdzqn5Axjz4i9Q0QKFA/OS6QSIvP9Y=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.9.4,<0.10.0" uv_build
+  '';
+
   build-system = [ uv-build ];
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix
index 9e6261a7f4f9..6e524411e0f8 100644
--- a/pkgs/development/python-modules/pytubefix/default.nix
+++ b/pkgs/development/python-modules/pytubefix/default.nix
@@ -3,6 +3,8 @@
   aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
+  replaceVars,
+  nodejs,
   setuptools,
   pytestCheckHook,
 }:
@@ -19,6 +21,12 @@ buildPythonPackage rec {
     hash = "sha256-GSXz89BztDOcAmAMPi3SIIDnUbvYJjnHf4DcWf1hqjY=";
   };
 
+  patches = [
+    (replaceVars ./replace-nodejs-wheel-binaries.patch {
+      inherit nodejs;
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [ aiohttp ];
@@ -37,6 +45,8 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
+    "test_get_initial_function_name_with_no_match_should_error"
+    "test_get_throttling_function_name"
     "test_playlist_failed_pagination"
     "test_playlist_pagination"
     "test_create_mock_html_json"
diff --git a/pkgs/development/python-modules/pytubefix/replace-nodejs-wheel-binaries.patch b/pkgs/development/python-modules/pytubefix/replace-nodejs-wheel-binaries.patch
new file mode 100644
index 000000000000..95be07567927
--- /dev/null
+++ b/pkgs/development/python-modules/pytubefix/replace-nodejs-wheel-binaries.patch
@@ -0,0 +1,54 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 3762b62..dfee082 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -33,7 +33,7 @@ classifiers = [
+ 	"Topic :: Terminals",
+ 	"Topic :: Utilities",
+ ]
+-dependencies = ["aiohttp >=3.12.13", "nodejs-wheel-binaries >= 22.20.0"]
++dependencies = ["aiohttp >=3.12.13"]
+ 
+ [project.urls]
+ "Homepage" = "https://github.com/juanbindez/pytubefix"
+diff --git a/pytubefix/botGuard/bot_guard.py b/pytubefix/botGuard/bot_guard.py
+index d7bde7e..ca10816 100644
+--- a/pytubefix/botGuard/bot_guard.py
++++ b/pytubefix/botGuard/bot_guard.py
+@@ -1,11 +1,10 @@
+ import os
+ import subprocess
+ import sys
+-import nodejs_wheel.executable
+ 
+ PLATFORM = sys.platform
+ 
+-NODE_DIR = nodejs_wheel.executable.ROOT_DIR
++NODE_DIR = "@nodejs@"
+ 
+ def _node_path() -> str:
+     suffix = ".exe" if os.name == "nt" else ""
+diff --git a/pytubefix/sig_nsig/node_runner.py b/pytubefix/sig_nsig/node_runner.py
+index 9ac068a..a7a2c72 100644
+--- a/pytubefix/sig_nsig/node_runner.py
++++ b/pytubefix/sig_nsig/node_runner.py
+@@ -1,11 +1,10 @@
+ import os
+ import json
+ import subprocess
+-import nodejs_wheel.executable
+ 
+ 
+ RUNNER_PATH = os.path.join(os.path.dirname(__file__), "vm", "runner.js")
+-NODE_DIR = nodejs_wheel.executable.ROOT_DIR
++NODE_DIR = "@nodejs@"
+ 
+ class NodeRunner:
+     def __init__(self, code: str):
+@@ -44,4 +43,4 @@ class NodeRunner:
+     def close(self):
+         self.proc.stdin.close()
+         self.proc.terminate()
+-        self.proc.wait()
+\ No newline at end of file
++        self.proc.wait()
diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix
index 79a23cdeae7e..98c085edba15 100644
--- a/pkgs/development/python-modules/pyturbojpeg/default.nix
+++ b/pkgs/development/python-modules/pyturbojpeg/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyturbojpeg";
-  version = "1.8.2";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lilohuang";
     repo = "PyTurboJPEG";
     tag = "v${version}";
-    hash = "sha256-zyLNIo7hQuzTlEgdvri3bSnAiRRKKup57tfCIxiBq24=";
+    hash = "sha256-yITX+6mP8AihaTFjZG9A5U6pAUTdPy6UDbbjnznwuqI=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/pyweatherflowudp/default.nix b/pkgs/development/python-modules/pyweatherflowudp/default.nix
index 1c0e63837a71..4f59bf387d3e 100644
--- a/pkgs/development/python-modules/pyweatherflowudp/default.nix
+++ b/pkgs/development/python-modules/pyweatherflowudp/default.nix
@@ -2,29 +2,29 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  hatchling,
   pint,
-  poetry-core,
-  poetry-dynamic-versioning,
   psychrolib,
   pytest-asyncio,
   pytestCheckHook,
+  uv-dynamic-versioning,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "pyweatherflowudp";
-  version = "1.5.0";
+  version = "1.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "briis";
     repo = "pyweatherflowudp";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-mo42Y6vPREuH5EaoALTJdzoaQLVEvfTeuJqV+N+PFRE=";
+    tag = finalAttrs.version;
+    hash = "sha256-07AvFvrnNainBpve3pkiHzbrqSsjcP0N/nJ2slwVdqc=";
   };
 
   build-system = [
-    poetry-core
-    poetry-dynamic-versioning
+    hatchling
+    uv-dynamic-versioning
   ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index 6cf36fd5e46f..fccc6585cbdb 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -17,7 +17,7 @@ let
 in
 buildPythonPackage rec {
   pname = "reportlab";
-  version = "4.4.9";
+  version = "4.4.10";
   pyproject = true;
 
   # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-fPSHdkKU7nkaR4H1oVe+vOJipmauS7uHeGdgqWdsk3g=";
+    hash = "sha256-XLuzSsNUYDnQCG3rKTjN7AaxLaPNuDboEyWOszzShIc=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/roma/default.nix b/pkgs/development/python-modules/roma/default.nix
index 9dd6844aa0e2..b3e65d0ace21 100644
--- a/pkgs/development/python-modules/roma/default.nix
+++ b/pkgs/development/python-modules/roma/default.nix
@@ -8,16 +8,16 @@
   torch,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "roma";
-  version = "1.5.4";
+  version = "1.5.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "naver";
     repo = "roma";
-    tag = "v${version}";
-    hash = "sha256-byPW58I+6mCE2fR6eVNQfNDCLbZSfoPmPbc/GuRpKGo=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-0R8p8pQxLQqK7MTbk9J5lFtA13XJth76Glemkfj9X/E=";
   };
 
   build-system = [
@@ -38,9 +38,10 @@ buildPythonPackage rec {
   ];
 
   meta = {
+    changelog = "https://naver.github.io/roma/#changelog";
     description = "Lightweight library to deal with 3D rotations in PyTorch";
     homepage = "https://github.com/naver/roma";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ nim65s ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index 38172b3fb813..3bbd316e8178 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -77,7 +77,7 @@ buildPythonPackage (finalAttrs: {
   # that override globally the `numpy` attribute to point to `numpy_1`.
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "numpy>=2.0.0,<2.6" numpy
+      --replace-fail "numpy>=2.0.0,<2.7" numpy
   '';
 
   build-system = [
@@ -128,6 +128,7 @@ buildPythonPackage (finalAttrs: {
       "hyp2f1_test_case3"
       "test_uint64_max"
       "test_large_m4" # https://github.com/scipy/scipy/issues/22466
+      "test_spiral_cleanup"
     ]
     ++ lib.optionals (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isBigEndian) [
       # https://github.com/scipy/scipy/issues/24090
diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix
index 3fb9e90e1617..08a3d12074f4 100644
--- a/pkgs/development/python-modules/sentence-transformers/default.nix
+++ b/pkgs/development/python-modules/sentence-transformers/default.nix
@@ -34,14 +34,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "sentence-transformers";
-  version = "5.2.2";
+  version = "5.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "sentence-transformers";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+ZJb56yo58nJtQz6LIyqsQA4yAFuDGeRRlkj0+iwUJ4=";
+    hash = "sha256-btbyPSsRAltd/hz5wFx70IKqn72e4VImaSgsqiFzTpM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix
index a4e47d389859..7c712cf8b69b 100644
--- a/pkgs/development/python-modules/setupmeta/default.nix
+++ b/pkgs/development/python-modules/setupmeta/default.nix
@@ -11,20 +11,20 @@
   six,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "setupmeta";
-  version = "3.8.0";
+  version = "3.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "codrsquad";
     repo = "setupmeta";
-    tag = "v${version}";
-    hash = "sha256-2SKiIkwfmXVOQBKBNUmw4SjiVpyLjIMpSHNA9IQxqwY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ONl+hFvMkUmPbzbeduCrqidGrKZvbWE0wTvaZMhs64w=";
   };
 
   preBuild = ''
-    export PYGRADLE_PROJECT_VERSION=${version};
+    export PYGRADLE_PROJECT_VERSION=${finalAttrs.version};
   '';
 
   build-system = [ setuptools ];
@@ -61,4 +61,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix
index 79158cf1ea63..a13c0e7be526 100644
--- a/pkgs/development/python-modules/setuptools-rust/default.nix
+++ b/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -43,16 +43,11 @@ buildPythonPackage rec {
   # integrate the setup hook to set up the build environment for cross compilation
   # this hook is automatically propagated to consumers using setuptools-rust as build-system
   #
-  # No need for the setup hook when python.pythonOnTargetForTarget is empty,
-  # or when the host & target platforms are the same.
-  #
+  # Only include the setup hook if python.pythonOnTargetForTarget is not empty.
   # python.pythonOnTargetForTarget is not always available, for example in
   # pkgsLLVM.python3.pythonOnTargetForTarget. cross build with pkgsLLVM should not be affected.
   setupHook =
-    if
-      python.pythonOnTargetForTarget == { }
-      || (lib.systems.equals stdenv.hostPlatform stdenv.targetPlatform)
-    then
+    if python.pythonOnTargetForTarget == { } then
       null
     else
       replaceVars ./setuptools-rust-hook.sh {
diff --git a/pkgs/development/python-modules/simsimd/default.nix b/pkgs/development/python-modules/simsimd/default.nix
index 80a72332edfb..c5dd1981d72e 100644
--- a/pkgs/development/python-modules/simsimd/default.nix
+++ b/pkgs/development/python-modules/simsimd/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "simsimd";
-  version = "6.5.12";
+  version = "6.5.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ashvardanian";
     repo = "SimSIMD";
     tag = "v${version}";
-    hash = "sha256-4mgWm4FcTGf9DNc39GOjK9jnyev7hIeODjpnuIz6f1k=";
+    hash = "sha256-jNJ44jCPcs83HbLSkup6eeCL0Hf+SyU4RzyQAyuPJ94=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 3f13dfc9c48f..41fb2a9ecf06 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -45,7 +45,7 @@
   callPackage,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "spacy";
   version = "3.8.11";
   pyproject = true;
@@ -53,10 +53,15 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "explosion";
     repo = "spaCy";
-    tag = "release-v${version}";
+    tag = "release-v${finalAttrs.version}";
     hash = "sha256-pLn3fq6SDstkRIv+1fj1yEGTlAd1IAiVgRu25CnEV8E=";
   };
 
+  postPatch = ''
+    substituteInPlace requirements.txt setup.cfg \
+      --replace-fail typer-slim typer
+  '';
+
   build-system = [
     cymem
     cython
@@ -147,9 +152,9 @@ buildPythonPackage rec {
   meta = {
     description = "Industrial-strength Natural Language Processing (NLP)";
     homepage = "https://github.com/explosion/spaCy";
-    changelog = "https://github.com/explosion/spaCy/releases/tag/${src.tag}";
+    changelog = "https://github.com/explosion/spaCy/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sarahec ];
     mainProgram = "spacy";
   };
-}
+})
diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix
index d1b8e9d288e6..5f52f0718c71 100644
--- a/pkgs/development/python-modules/sphinx-autoapi/default.nix
+++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "sphinx-autoapi";
-  version = "3.6.1";
+  version = "3.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "readthedocs";
     repo = "sphinx-autoapi";
     tag = "v${version}";
-    hash = "sha256-dafrvrTl4bVBBaAhTCIPVrSA1pdNlbT5Rou3T//fmKQ=";
+    hash = "sha256-yUWjL+42wju0C+vlZrH30nqTNFCt57TPOZTuefNhaj0=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/sphinx-autodoc2/default.nix b/pkgs/development/python-modules/sphinx-autodoc2/default.nix
index a0cf4db57cab..4607a2f13ffa 100644
--- a/pkgs/development/python-modules/sphinx-autodoc2/default.nix
+++ b/pkgs/development/python-modules/sphinx-autodoc2/default.nix
@@ -47,8 +47,7 @@ buildPythonPackage (finalAttrs: {
 
     # cli deps
     typer
-  ]
-  ++ typer.optional-dependencies.standard;
+  ];
 
   preCheck = ''
     # make sphinx_path an alias of pathlib.Path, since sphinx_path was removed in Sphinx v7.2.0
diff --git a/pkgs/development/python-modules/sphinx-design/default.nix b/pkgs/development/python-modules/sphinx-design/default.nix
index f9d78dcc6719..20b0c3cdf939 100644
--- a/pkgs/development/python-modules/sphinx-design/default.nix
+++ b/pkgs/development/python-modules/sphinx-design/default.nix
@@ -25,7 +25,6 @@
 buildPythonPackage (finalAttrs: {
   pname = "sphinx-design";
   version = "0.7.0";
-
   pyproject = true;
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/stanza/default.nix b/pkgs/development/python-modules/stanza/default.nix
index 9944f2d3d673..ecdcb30b062f 100644
--- a/pkgs/development/python-modules/stanza/default.nix
+++ b/pkgs/development/python-modules/stanza/default.nix
@@ -1,47 +1,52 @@
 {
   lib,
   buildPythonPackage,
-  emoji,
   fetchFromGitHub,
+  # build-system
+  setuptools,
+  # dependencies
+  emoji,
   networkx,
   numpy,
   peft,
   protobuf,
   requests,
-  six,
-  toml,
   torch,
   tqdm,
   transformers,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "stanza";
   version = "1.11.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "stanfordnlp";
     repo = "stanza";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-zY2+8QuPJTX/HSkE/gKMCWpSanKpYSGZeeYgb4eFuuw=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     emoji
     networkx
     numpy
     peft
     protobuf
     requests
-    six
-    toml
     torch
     tqdm
     transformers
   ];
 
-  # Tests require network access
+  # Most tests require resources from the network (models). Many of the ones that do run are slow
+  # and some of them fail.
+  #
+  # Maintaining a list of "tests we can actually run in CI" isn't feasible, there are WAY too many
+  # exceptions and no useful pytest marks.
   doCheck = false;
 
   pythonImportsCheck = [ "stanza" ];
@@ -49,8 +54,11 @@ buildPythonPackage rec {
   meta = {
     description = "Official Stanford NLP Python Library for Many Human Languages";
     homepage = "https://github.com/stanfordnlp/stanza/";
-    changelog = "https://github.com/stanfordnlp/stanza/releases/tag/v${version}";
+    changelog = "https://github.com/stanfordnlp/stanza/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ riotbib ];
+    maintainers = with lib.maintainers; [
+      riotbib
+      Stebalien
+    ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index b7504df075d1..d78c4ddba654 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -277,7 +277,7 @@ let
   # From here on, `stdenv` shall be `stdenv'`.
   stdenv = stdenv';
 in
-buildPythonPackage.override { inherit stdenv; } rec {
+buildPythonPackage.override { inherit stdenv; } (finalAttrs: {
   pname = "torch";
   # Don't forget to update torch-bin to the same version.
   version = "2.9.1";
@@ -293,11 +293,13 @@ buildPythonPackage.override { inherit stdenv; } rec {
 
   src = callPackage ./src.nix {
     inherit
-      version
       fetchFromGitHub
       fetchFromGitLab
       runCommand
       ;
+    inherit (finalAttrs)
+      version
+      ;
   };
 
   patches = [
@@ -420,35 +422,76 @@ buildPythonPackage.override { inherit stdenv; } rec {
   # causes possible redefinition of _FORTIFY_SOURCE
   hardeningDisable = [ "fortify3" ];
 
-  BUILD_NAMEDTENSOR = setBool true;
-  BUILD_DOCS = setBool buildDocs;
+  env = {
+    BUILD_NAMEDTENSOR = setBool true;
+    BUILD_DOCS = setBool buildDocs;
 
-  # We only do an imports check, so do not build tests either.
-  BUILD_TEST = setBool false;
+    # We only do an imports check, so do not build tests either.
+    BUILD_TEST = setBool false;
 
-  # ninja hook doesn't automatically turn on ninja
-  # because pytorch setup.py is responsible for this
-  CMAKE_GENERATOR = "Ninja";
+    # ninja hook doesn't automatically turn on ninja
+    # because pytorch setup.py is responsible for this
+    CMAKE_GENERATOR = "Ninja";
 
-  # Unlike MKL, oneDNN (née MKLDNN) is FOSS, so we enable support for
-  # it by default. PyTorch currently uses its own vendored version
-  # of oneDNN through Intel iDeep.
-  USE_MKLDNN = setBool mklDnnSupport;
-  USE_MKLDNN_CBLAS = setBool mklDnnSupport;
+    # Unlike MKL, oneDNN (née MKLDNN) is FOSS, so we enable support for
+    # it by default. PyTorch currently uses its own vendored version
+    # of oneDNN through Intel iDeep.
+    USE_MKLDNN = setBool mklDnnSupport;
+    USE_MKLDNN_CBLAS = setBool mklDnnSupport;
 
-  # Avoid using pybind11 from git submodule
-  # Also avoids pytorch exporting the headers of pybind11
-  USE_SYSTEM_PYBIND11 = true;
+    # Avoid using pybind11 from git submodule
+    # Also avoids pytorch exporting the headers of pybind11
+    USE_SYSTEM_PYBIND11 = true;
 
-  # Multicore CPU convnet support
-  USE_NNPACK = 1;
+    # Multicore CPU convnet support
+    USE_NNPACK = 1;
 
-  # Explicitly enable MPS for Darwin
-  USE_MPS = setBool stdenv.hostPlatform.isDarwin;
+    # Explicitly enable MPS for Darwin
+    USE_MPS = setBool stdenv.hostPlatform.isDarwin;
 
-  # building torch.distributed on Darwin is disabled by default
-  # https://pytorch.org/docs/stable/distributed.html#torch.distributed.is_available
-  USE_DISTRIBUTED = setBool true;
+    # building torch.distributed on Darwin is disabled by default
+    # https://pytorch.org/docs/stable/distributed.html#torch.distributed.is_available
+    USE_DISTRIBUTED = setBool true;
+
+    # Override the (weirdly) wrong version set by default. See
+    # https://github.com/NixOS/nixpkgs/pull/52437#issuecomment-449718038
+    # https://github.com/pytorch/pytorch/blob/v1.0.0/setup.py#L267
+    PYTORCH_BUILD_VERSION = finalAttrs.version;
+    PYTORCH_BUILD_NUMBER = 0;
+
+    # In-tree builds of NCCL are not supported.
+    # Use NCCL when cudaSupport is enabled and nccl is available.
+    USE_NCCL = setBool useSystemNccl;
+    USE_SYSTEM_NCCL = finalAttrs.env.USE_NCCL;
+    USE_STATIC_NCCL = finalAttrs.env.USE_NCCL;
+
+    # Set the correct Python library path, broken since
+    # https://github.com/pytorch/pytorch/commit/3d617333e
+    PYTHON_LIB_REL_PATH = "${placeholder "out"}/${python.sitePackages}";
+    # disable warnings as errors as they break the build on every compiler
+    # bump, among other things.
+    # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++:
+    # https://github.com/pytorch/pytorch/blob/v1.11.0/setup.py#L17
+    NIX_CFLAGS_COMPILE = toString (
+      [
+        "-Wno-error"
+      ]
+      # fix build aarch64-linux build failure with GCC14
+      ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+        "-Wno-error=incompatible-pointer-types"
+      ]
+    );
+    USE_VULKAN = setBool vulkanSupport;
+  }
+  // lib.optionalAttrs vulkanSupport {
+    VULKAN_SDK = shaderc.bin;
+  }
+  // lib.optionalAttrs rocmSupport {
+    AOTRITON_INSTALLED_PREFIX = "${rocmPackages.aotriton}";
+    # Broken HIP flag setup, fails to compile due to not finding rocthrust
+    # Only supports gfx942 so let's turn it off for now
+    USE_FBGEMM_GENAI = setBool false;
+  };
 
   cmakeFlags = [
     (lib.cmakeFeature "PYTHON_SIX_SOURCE_DIR" "${six.src}")
@@ -482,48 +525,6 @@ buildPythonPackage.override { inherit stdenv; } rec {
     done
   '';
 
-  # Override the (weirdly) wrong version set by default. See
-  # https://github.com/NixOS/nixpkgs/pull/52437#issuecomment-449718038
-  # https://github.com/pytorch/pytorch/blob/v1.0.0/setup.py#L267
-  PYTORCH_BUILD_VERSION = version;
-  PYTORCH_BUILD_NUMBER = 0;
-
-  # In-tree builds of NCCL are not supported.
-  # Use NCCL when cudaSupport is enabled and nccl is available.
-  USE_NCCL = setBool useSystemNccl;
-  USE_SYSTEM_NCCL = USE_NCCL;
-  USE_STATIC_NCCL = USE_NCCL;
-
-  # Set the correct Python library path, broken since
-  # https://github.com/pytorch/pytorch/commit/3d617333e
-  PYTHON_LIB_REL_PATH = "${placeholder "out"}/${python.sitePackages}";
-
-  env = {
-    # disable warnings as errors as they break the build on every compiler
-    # bump, among other things.
-    # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++:
-    # https://github.com/pytorch/pytorch/blob/v1.11.0/setup.py#L17
-    NIX_CFLAGS_COMPILE = toString (
-      [
-        "-Wno-error"
-      ]
-      # fix build aarch64-linux build failure with GCC14
-      ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-        "-Wno-error=incompatible-pointer-types"
-      ]
-    );
-    USE_VULKAN = setBool vulkanSupport;
-  }
-  // lib.optionalAttrs vulkanSupport {
-    VULKAN_SDK = shaderc.bin;
-  }
-  // lib.optionalAttrs rocmSupport {
-    AOTRITON_INSTALLED_PREFIX = "${rocmPackages.aotriton}";
-    # Broken HIP flag setup, fails to compile due to not finding rocthrust
-    # Only supports gfx942 so let's turn it off for now
-    USE_FBGEMM_GENAI = setBool false;
-  };
-
   nativeBuildInputs = [
     cmake
     which
@@ -650,7 +651,7 @@ buildPythonPackage.override { inherit stdenv; } rec {
         # ^^^^^^^^^^^^ NOTE: while test_dataloader does return errors, these are acceptable errors and do not interfere with the build
 
         # tensorboard has acceptable failures for pytorch 1.3.x due to dependencies on tensorboard-plugins
-        (optionalString (majorMinor version == "1.3") "tensorboard")
+        (optionalString (majorMinor finalAttrs.version == "1.3") "tensorboard")
       ])
       "runHook postCheck"
     ];
@@ -692,7 +693,7 @@ buildPythonPackage.override { inherit stdenv; } rec {
       --replace-fail "\''${_IMPORT_PREFIX}/lib64" "$lib/lib"
 
     substituteInPlace $dev/share/cmake/ATen/ATenConfig.cmake \
-      --replace-fail "/build/${src.name}/torch/include" "$dev/include"
+      --replace-fail "/build/${finalAttrs.src.name}/torch/include" "$dev/include"
   '';
 
   postFixup = ''
@@ -751,7 +752,7 @@ buildPythonPackage.override { inherit stdenv; } rec {
   };
 
   meta = {
-    changelog = "https://github.com/pytorch/pytorch/releases/tag/v${version}";
+    changelog = "https://github.com/pytorch/pytorch/releases/tag/v${finalAttrs.version}";
     # keep PyTorch in the description so the package can be found under that name on search.nixos.org
     description = "PyTorch: Tensors and Dynamic neural networks in Python with strong GPU acceleration";
     homepage = "https://pytorch.org/";
@@ -767,4 +768,4 @@ buildPythonPackage.override { inherit stdenv; } rec {
       lib.platforms.linux ++ lib.optionals (!cudaSupport && !rocmSupport) lib.platforms.darwin;
     broken = builtins.any trivial.id (builtins.attrValues brokenConditions);
   };
-}
+})
diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index c0679aa8779f..e3f1050f8f45 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -7,17 +7,15 @@
   setuptools,
 
   # dependencies
-  filelock,
   huggingface-hub,
   numpy,
-  protobuf,
   packaging,
   pyyaml,
   regex,
   safetensors,
   tokenizers,
   tqdm,
-  typer-slim,
+  typer,
 
   # optional-dependencies
   # sklearn
@@ -25,23 +23,28 @@
   # torch
   torch,
   accelerate,
-  # hf_xet
-  hf-xet,
+  # deepspeed
+  # deepspeed,
+  # codecarbon
+  # codecarbon,
   # retrieval
   faiss,
   datasets,
-  # tokenizers
-  # ftfy
-  ftfy,
-  # modelcreation
-  cookiecutter,
+  # ja
+  fugashi,
+  ipadic,
+  sudachipy,
+  # sudachidict_core,
+  # unidic_lite,
+  unidic,
+  # rhoknp,
   # sagemaker
   sagemaker,
   # optuna
   optuna,
   # ray
   ray,
-  # hub-kernels
+  # kernels
   kernels,
   # serving
   openai,
@@ -52,8 +55,9 @@
   rich,
   # audio
   librosa,
+  # pyctcdecode,
   phonemizer,
-  # speech
+  # kenlm,
   torchaudio,
   # vision
   pillow,
@@ -67,6 +71,7 @@
   num2words,
   # sentencepiece
   sentencepiece,
+  protobuf,
   # tiktoken
   tiktoken,
   blobfile,
@@ -80,27 +85,32 @@
   gitpython,
   urllib3,
   libcst,
-  pandas,
-  # torchhub
-  importlib-metadata,
+  # opentelemetry
+  opentelemetry-api,
+  opentelemetry-exporter-otlp,
+  opentelemetry-sdk,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "transformers";
-  version = "5.0.0";
+  version = "5.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "transformers";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ART1ARd+hfC0GQNDa225SWF0zTFUKE4eDxFYbWFaTl8=";
+    hash = "sha256-vus4Y+1QXUNqwBO1ZK0gWd+sJBPwrqWW7O2sn0EBvno=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail "typer-slim" "typer"
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [
-    filelock
     huggingface-hub
     numpy
     packaging
@@ -109,18 +119,18 @@ buildPythonPackage (finalAttrs: {
     safetensors
     tokenizers
     tqdm
-    typer-slim
+    typer
   ];
 
   optional-dependencies = lib.fix (self: {
     ja = [
-      # fugashi
-      # ipadic
+      fugashi
+      ipadic
       # unidic_lite
-      # unidic
-      # sudachipy
-      # sudachidict_core
+      unidic
       # rhoknp
+      sudachipy
+      # sudachidict_core
     ];
     sklearn = [ scikit-learn ];
     torch = [
@@ -128,14 +138,10 @@ buildPythonPackage (finalAttrs: {
       accelerate
     ];
     accelerate = [ accelerate ];
-    hf_xet = [ hf-xet ];
     retrieval = [
       faiss
       datasets
     ];
-    tokenizers = [ tokenizers ];
-    ftfy = [ ftfy ];
-    modelcreation = [ cookiecutter ];
     sagemaker = [ sagemaker ];
     deepspeed = [
       # deepspeed
@@ -143,8 +149,11 @@ buildPythonPackage (finalAttrs: {
     ++ self.accelerate;
     optuna = [ optuna ];
     ray = [ ray ] ++ ray.optional-dependencies.tune;
-    hub-kernels = [ kernels ];
-    integrations = self.hub-kernels ++ self.optuna ++ self.ray;
+    kernels = [ kernels ];
+    codecarbon = [
+      # codecarbon
+    ];
+    integrations = self.kernels ++ self.optuna ++ self.codecarbon ++ self.ray;
     serving = [
       openai
       pydantic
@@ -155,22 +164,16 @@ buildPythonPackage (finalAttrs: {
     ]
     ++ self.torch;
     audio = [
+      torchaudio
       librosa
       # pyctcdecode
       phonemizer
-      # kenlm
     ];
-    speech = [ torchaudio ] ++ self.audio;
-    torch-speech = [ torchaudio ] ++ self.audio;
-    vision = [ pillow ];
+    vision = [
+      torchvision
+      pillow
+    ];
     timm = [ timm ];
-    torch-vision = [ torchvision ] ++ self.vision;
-    natten = [
-      # natten
-    ];
-    codecarbon = [
-      # codecarbon
-    ];
     video = [ av ];
     num2words = [ num2words ];
     sentencepiece = [
@@ -182,7 +185,7 @@ buildPythonPackage (finalAttrs: {
       blobfile
     ];
     mistral-common = [ mistral-common ] ++ mistral-common.optional-dependencies.image;
-    chat_template = [
+    chat-template = [
       jinja2
       jmespath
     ];
@@ -193,24 +196,15 @@ buildPythonPackage (finalAttrs: {
       urllib3
       libcst
       rich
-      pandas
-    ];
-    torchhub = [
-      filelock
-      huggingface-hub
-      importlib-metadata
-      numpy
-      packaging
-      protobuf
-      regex
-      sentencepiece
-      torch
-      tokenizers
-      tqdm
     ];
     benchmark = [
       # optimum-benchmark
     ];
+    open-telemetry = [
+      opentelemetry-api
+      opentelemetry-exporter-otlp
+      opentelemetry-sdk
+    ];
   });
 
   # Many tests require internet access.
@@ -226,6 +220,7 @@ buildPythonPackage (finalAttrs: {
     license = lib.licenses.asl20;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
+      GaetanLepage
       pashashocky
       happysalada
     ];
diff --git a/pkgs/development/python-modules/typer-injector/default.nix b/pkgs/development/python-modules/typer-injector/default.nix
index 109ae7c7b796..b65096ff5aa6 100644
--- a/pkgs/development/python-modules/typer-injector/default.nix
+++ b/pkgs/development/python-modules/typer-injector/default.nix
@@ -5,7 +5,7 @@
   hatchling,
   lib,
   pytestCheckHook,
-  typer-slim,
+  typer,
 }:
 
 buildPythonPackage rec {
@@ -20,13 +20,18 @@ buildPythonPackage rec {
     hash = "sha256-nwEYFw+4jeF/SoaZWR51VWRezqBFjGoLiVgJWdPNoIk=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "typer-slim" "typer"
+  '';
+
   build-system = [
     hatch-vcs
     hatchling
   ];
 
   dependencies = [
-    typer-slim
+    typer
   ];
 
   pythonImportsCheck = [ "typer_injector" ];
diff --git a/pkgs/development/python-modules/typer-slim/default.nix b/pkgs/development/python-modules/typer-slim/default.nix
deleted file mode 100644
index b39dafd85611..000000000000
--- a/pkgs/development/python-modules/typer-slim/default.nix
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  pdm-backend,
-
-  # dependencies
-  click,
-  typing-extensions,
-
-  # optional-dependencies
-  rich,
-  shellingham,
-
-  # tests
-  pytest-xdist,
-  pytestCheckHook,
-  writableTmpDirAsHomeHook,
-  procps,
-}:
-
-buildPythonPackage rec {
-  pname = "typer-slim";
-  version = "0.21.1";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "fastapi";
-    repo = "typer";
-    tag = version;
-    hash = "sha256-m/oJL6Yn3SzlD72vaPoag8EOThcNgyLPoiitqBqLgEU=";
-  };
-
-  postPatch = ''
-    for f in $(find tests -type f -print); do
-      # replace `sys.executable -m coverage run` with `sys.executable`
-      sed -z -i 's/"-m",\n\?\s*"coverage",\n\?\s*"run",//g' "$f"
-    done
-  '';
-
-  env.TIANGOLO_BUILD_PACKAGE = "typer-slim";
-
-  build-system = [ pdm-backend ];
-
-  dependencies = [
-    click
-    typing-extensions
-  ];
-
-  optional-dependencies = {
-    standard = [
-      rich
-      shellingham
-    ];
-  };
-
-  nativeCheckInputs = [
-    pytest-xdist
-    pytestCheckHook
-    writableTmpDirAsHomeHook
-  ]
-  ++ lib.concatAttrValues optional-dependencies
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    procps
-  ];
-
-  disabledTests = [
-    "test_scripts"
-    # Likely related to https://github.com/sarugaku/shellingham/issues/35
-    # fails also on Linux
-    "test_show_completion"
-    "test_install_completion"
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-    "test_install_completion"
-  ];
-
-  pythonImportsCheck = [ "typer" ];
-
-  meta = {
-    description = "Library for building CLI applications";
-    homepage = "https://typer.tiangolo.com/";
-    changelog = "https://github.com/tiangolo/typer/releases/tag/${version}";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ winpat ];
-  };
-}
diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix
index 6e1daa7b91e0..c9bc634b3549 100644
--- a/pkgs/development/python-modules/typer/default.nix
+++ b/pkgs/development/python-modules/typer/default.nix
@@ -1,20 +1,84 @@
 {
   lib,
-  mkPythonMetaPackage,
-  typer-slim,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  pdm-backend,
+
+  # dependencies
+  annotated-doc,
+  click,
+
+  # optional-dependencies
+  rich,
+  shellingham,
+
+  # tests
+  pytest-xdist,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
+  procps,
 }:
 
-mkPythonMetaPackage {
+buildPythonPackage rec {
   pname = "typer";
-  inherit (typer-slim) version optional-dependencies;
-  dependencies = [ typer-slim ] ++ typer-slim.optional-dependencies.standard;
+  version = "0.24.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "fastapi";
+    repo = "typer";
+    tag = version;
+    hash = "sha256-ha/cT2+I9/WUjb7ZXSKqLSocZ3vq0N1fm4RvRpsXIDc=";
+  };
+
+  postPatch = ''
+    for f in $(find tests -type f -print); do
+      # replace `sys.executable -m coverage run` with `sys.executable`
+      sed -z -i 's/"-m",\n\?\s*"coverage",\n\?\s*"run",//g' "$f"
+    done
+  '';
+
+  env.TIANGOLO_BUILD_PACKAGE = "typer";
+
+  build-system = [ pdm-backend ];
+
+  dependencies = [
+    annotated-doc
+    click
+    rich
+    shellingham
+  ];
+
+  nativeCheckInputs = [
+    pytest-xdist
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    procps
+  ];
+
+  disabledTests = [
+    "test_scripts"
+    # Likely related to https://github.com/sarugaku/shellingham/issues/35
+    # fails also on Linux
+    "test_show_completion"
+    "test_install_completion"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    "test_install_completion"
+  ];
+
+  pythonImportsCheck = [ "typer" ];
+
   meta = {
-    inherit (typer-slim.meta)
-      changelog
-      description
-      homepage
-      license
-      maintainers
-      ;
+    description = "Library for building CLI applications";
+    homepage = "https://typer.tiangolo.com/";
+    changelog = "https://github.com/tiangolo/typer/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ winpat ];
   };
 }
diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix
index c4b1302c8216..9b9c22767be0 100644
--- a/pkgs/development/python-modules/types-aiobotocore/default.nix
+++ b/pkgs/development/python-modules/types-aiobotocore/default.nix
@@ -371,13 +371,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "types-aiobotocore";
-  version = "3.1.2";
+  version = "3.1.3";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_aiobotocore";
     inherit (finalAttrs) version;
-    hash = "sha256-gsGbtvpNcMymvv/MSa5fKJkMkXjtX9PvPIbWnwYu58I=";
+    hash = "sha256-4Zs7kdnaRsxftMCunlGm8C4WhgjbhMu8vCajxBnPOGo=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix
index ad92467bed7b..b4ec1f08548b 100644
--- a/pkgs/development/python-modules/types-awscrt/default.nix
+++ b/pkgs/development/python-modules/types-awscrt/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "types-awscrt";
-  version = "0.31.1";
+  version = "0.31.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_awscrt";
     inherit (finalAttrs) version;
-    hash = "sha256-CLE0lPk/RcGpLrJkdV/OUO0NHcdQWau14xZw/rmglyQ=";
+    hash = "sha256-3HlwWs0kCUZWuBBbjXmdfic8jqw3xpE331gM2EvrVPY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix
index bfb7a1b1ecb2..37ef1c99419e 100644
--- a/pkgs/development/python-modules/uiprotect/default.nix
+++ b/pkgs/development/python-modules/uiprotect/default.nix
@@ -9,8 +9,6 @@
   # dependencies
   aiofiles,
   aiohttp,
-  aioshutil,
-  async-timeout,
   av,
   convertertools,
   dateparser,
@@ -52,11 +50,14 @@ buildPythonPackage (finalAttrs: {
 
   build-system = [ poetry-core ];
 
+  pythonRemoveDeps = [
+    "aioshutil"
+    "async-timeout"
+  ];
+
   dependencies = [
     aiofiles
     aiohttp
-    aioshutil
-    async-timeout
     av
     convertertools
     dateparser
diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix
index 81f6bf4b83b3..fee9037a6092 100644
--- a/pkgs/development/python-modules/urwid/default.nix
+++ b/pkgs/development/python-modules/urwid/default.nix
@@ -7,6 +7,7 @@
   pygobject3,
   pyserial,
   pytestCheckHook,
+  pythonOlder,
   pyzmq,
   setuptools,
   setuptools-scm,
@@ -19,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "urwid";
-  version = "3.0.4";
+  version = "3.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "urwid";
     repo = "urwid";
     tag = version;
-    hash = "sha256-mKBLAoEBiqr//1Gl8DAmpUJ9woq6Zf2HhbYEirAoi2M=";
+    hash = "sha256-9ajcpyQTSASz8A4eM78vPjL+9Rk07Q30JmIrSx0Crpo=";
   };
 
   postPatch = ''
@@ -44,12 +45,10 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
+    curses = [ ];
     glib = [ pygobject3 ];
     tornado = [ tornado ];
-    trio = [
-      exceptiongroup
-      trio
-    ];
+    trio = [ trio ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ];
     twisted = [ twisted ];
     zmq = [ pyzmq ];
     serial = [ pyserial ];
diff --git a/pkgs/development/python-modules/uv-build/built-by-uv.nix b/pkgs/development/python-modules/uv-build/built-by-uv.nix
index aa3ba16693ff..7b4d35d85556 100644
--- a/pkgs/development/python-modules/uv-build/built-by-uv.nix
+++ b/pkgs/development/python-modules/uv-build/built-by-uv.nix
@@ -1,6 +1,5 @@
 {
   buildPythonPackage,
-  uv,
   uv-build,
   anyio,
   pytestCheckHook,
@@ -10,7 +9,7 @@ buildPythonPackage {
   version = "0.1.0";
   pyproject = true;
 
-  src = "${uv.src}/scripts/packages/built-by-uv";
+  src = "${uv-build.src}/test/packages/built-by-uv";
 
   build-system = [ uv-build ];
 
diff --git a/pkgs/development/python-modules/uv-build/default.nix b/pkgs/development/python-modules/uv-build/default.nix
index 6f8f768761fe..c37b17d316c7 100644
--- a/pkgs/development/python-modules/uv-build/default.nix
+++ b/pkgs/development/python-modules/uv-build/default.nix
@@ -7,16 +7,16 @@
   callPackage,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "uv-build";
-  version = "0.9.26";
+  version = "0.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
-    tag = version;
-    hash = "sha256-qvfMB62/0Hvc7m5h+QitvUcS6YZWAV1uGPg8JpCKPNU=";
+    tag = finalAttrs.version;
+    hash = "sha256-nD26zqKMK5LNkeYdqVYteeYL4mYaQQ/QlyjbMDDhLAY=";
   };
 
   nativeBuildInputs = [
@@ -25,8 +25,8 @@ buildPythonPackage rec {
   ];
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
-    hash = "sha256-3ncKhauappl1MR3EG1bwYVrwhM7gCFRcRyRvYrsDaok=";
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-lEynVemQHCI7ZKD2+1n4K/AtEYRld2+aRLkDMSX8ejM=";
   };
 
   buildAndTestSubdir = "crates/uv-build";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
 
   # Run the tests of a package built by `uv_build`.
   passthru = {
-    tests.built-by-uv = callPackage ./built-by-uv.nix { inherit (pkgs) uv; };
+    tests.built-by-uv = callPackage ./built-by-uv.nix { };
 
     # updateScript is not needed here, as updating is done on staging
   };
@@ -52,4 +52,4 @@ buildPythonPackage rec {
     inherit (pkgs.uv.meta) changelog license;
     maintainers = with lib.maintainers; [ bengsparks ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/weasel/default.nix b/pkgs/development/python-modules/weasel/default.nix
index aedf6e86ea44..fb4b108a66bf 100644
--- a/pkgs/development/python-modules/weasel/default.nix
+++ b/pkgs/development/python-modules/weasel/default.nix
@@ -14,7 +14,7 @@
   requests,
   smart-open,
   srsly,
-  typer-slim,
+  typer,
   wasabi,
 
   # tests
@@ -33,6 +33,11 @@ buildPythonPackage rec {
     hash = "sha256-Xd7cJlUi/a8gwtnuO9wqZiHT1xVMbp6V6Ha+Kyr4tFE=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace-fail "typer-slim" "typer"
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -43,7 +48,7 @@ buildPythonPackage rec {
     requests
     smart-open
     srsly
-    typer-slim
+    typer
     wasabi
   ];
 
diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix
index 870a37947e59..8d829187a5c8 100644
--- a/pkgs/development/python-modules/xknx/default.nix
+++ b/pkgs/development/python-modules/xknx/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "xknx";
-  version = "3.14.0";
+  version = "3.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "XKNX";
     repo = "xknx";
     tag = finalAttrs.version;
-    hash = "sha256-22xKxdjf0WEF2efHiGCYVhTCZ5jrD+26oqBdlxHwYdU=";
+    hash = "sha256-EA6F4Wkji495uVfFyN1M+jZsXFkKbfK7POie3qbuqBY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix
index cf41ad80d670..bdb4bcaff32c 100644
--- a/pkgs/development/tools/language-servers/nixd/default.nix
+++ b/pkgs/development/tools/language-servers/nixd/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   boost,
   gtest,
@@ -133,6 +134,17 @@ in
     // {
       pname = "nixd";
 
+      patches = [
+        # Pull upstream fix for boost-1.89 & boost 1.87 support:
+        #   https://github.com/nix-community/nixd/pull/783
+        (fetchpatch {
+          name = "boost-1.89.patch";
+          url = "https://github.com/nix-community/nixd/commit/11dfdf5f2db2e0fc1fea0349fb68739a9c747a41.patch";
+          hash = "sha256-aCb9wRKqZSuUXmamzjpYe0vRqEQh4tenwoScv+juYK8=";
+          stripLen = 1;
+        })
+      ];
+
       sourceRoot = "${common.src.name}/nixd";
 
       buildInputs = [
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index fc24c92a96e7..e6b41ccb65ef 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -40,6 +40,9 @@ in
 
 lib.mapAttrs' (
   language: attrs:
+  let
+    source = lib.optionalAttrs (attrs ? url) (parseUrl attrs.url);
+  in
   lib.nameValuePair "tree-sitter-${language}" (
     {
       # Default to the source attr name as the language
@@ -55,7 +58,7 @@ lib.mapAttrs' (
           if (isUnstable attrs.version) then
             [
               "--version"
-              "branch"
+              "branch${lib.optionalString (source ? ref) "=${source.ref}"}"
             ]
           else
             [
@@ -70,7 +73,6 @@ lib.mapAttrs' (
     // lib.optionalAttrs (attrs ? url && attrs ? hash) {
       src =
         let
-          source = parseUrl attrs.url;
           fetch = lib.getAttr source.type {
             github = fetchFromGitHub;
             gitlab = fetchFromGitLab;
@@ -78,19 +80,26 @@ lib.mapAttrs' (
             codeberg = fetchFromCodeberg;
             # NOTE: include other types here as required
           };
+          rev =
+            if isUnstable attrs.version then
+              attrs.rev
+                or (throw "tree-sitter grammar '${language}': unstable version requires a pinned 'rev' attribute")
+            else
+              source.ref or "v${attrs.version}";
         in
         fetch {
           inherit (source)
             owner
             repo
             ;
-          rev = source.ref or "v${attrs.version}";
+          inherit rev;
           inherit (attrs) hash;
         };
     }
     // removeAttrs attrs [
       "url"
       "hash"
+      "rev"
     ]
   )
 ) grammar-sources
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 d17653b7d2b8..d034b612a02d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
@@ -10,7 +10,8 @@
 
   adl = {
     version = "0-unstable-2024-04-03";
-    url = "github:adl-lang/tree-sitter-adl/2787d04beadfbe154d3f2da6e98dc45a1b134bbf";
+    url = "github:adl-lang/tree-sitter-adl";
+    rev = "2787d04beadfbe154d3f2da6e98dc45a1b134bbf";
     hash = "sha256-gYEtTjjy8qClYg4+ZnKwNUWMxKTc3sUXQdsVCwB7H6w=";
     meta = {
       maintainers = with lib.maintainers; [
@@ -33,7 +34,8 @@
 
   alloy = {
     version = "0-unstable-2024-11-29";
-    url = "github:mattsre/tree-sitter-alloy/58d462b1cdb077682b130caa324f3822aeb00b8e";
+    url = "github:mattsre/tree-sitter-alloy";
+    rev = "58d462b1cdb077682b130caa324f3822aeb00b8e";
     hash = "sha256-yDYGtM/vlZqeOy2O+scGHc6Dae0H/cXyC6Gu0inwJNA=";
     meta = {
       license = lib.licenses.mit;
@@ -45,7 +47,8 @@
 
   amber = {
     version = "0-unstable-2025-11-26";
-    url = "github:amber-lang/tree-sitter-amber/107c6d4a420fb0c5962b62ebd9347b7eb0015957";
+    url = "github:amber-lang/tree-sitter-amber";
+    rev = "107c6d4a420fb0c5962b62ebd9347b7eb0015957";
     hash = "sha256-vEEjHg/qRFfgA8AEWP7hp28/rxBCjPTvxLSMnvlXyi8=";
     meta = {
       license = lib.licenses.mit;
@@ -57,7 +60,8 @@
 
   astro = {
     version = "0-unstable-2025-04-23";
-    url = "github:virchau13/tree-sitter-astro/213f6e6973d9b456c6e50e86f19f66877e7ef0ee";
+    url = "github:virchau13/tree-sitter-astro";
+    rev = "213f6e6973d9b456c6e50e86f19f66877e7ef0ee";
     hash = "sha256-TpXs3jbYn39EHxTdtSfR7wLA1L8v9uyK/ATPp5v4WqE=";
     meta = {
       license = lib.licenses.mit;
@@ -69,7 +73,8 @@
 
   awk = {
     version = "0-unstable-2024-11-02";
-    url = "github:Beaglefoot/tree-sitter-awk/34bbdc7cce8e803096f47b625979e34c1be38127";
+    url = "github:Beaglefoot/tree-sitter-awk";
+    rev = "34bbdc7cce8e803096f47b625979e34c1be38127";
     hash = "sha256-MDfAtG6ZC0KttJ5bdW71Jgts+SAJitRnwu8xQ26N9K0=";
     meta = {
       license = lib.licenses.mit;
@@ -90,7 +95,8 @@
 
   bass = {
     version = "0-unstable-2024-05-03";
-    url = "github:vito/tree-sitter-bass/28dc7059722be090d04cd751aed915b2fee2f89a";
+    url = "github:vito/tree-sitter-bass";
+    rev = "28dc7059722be090d04cd751aed915b2fee2f89a";
     hash = "sha256-NKu60BbTKLsYQRtfEoqGQUKERJFnmZNVJE6HBz/BRIM=";
     meta = {
       license = lib.licenses.mit;
@@ -111,7 +117,8 @@
 
   bibtex = {
     version = "0-unstable-2025-04-19";
-    url = "github:latex-lsp/tree-sitter-bibtex/8d04ed27b3bc7929f14b7df9236797dab9f3fa66";
+    url = "github:latex-lsp/tree-sitter-bibtex";
+    rev = "8d04ed27b3bc7929f14b7df9236797dab9f3fa66";
     hash = "sha256-UOXGWm8k9YP0GUwvNEuIxeiXqJo4Jf9uBt+/oYaYUl4=";
     meta = {
       license = lib.licenses.mit;
@@ -120,7 +127,8 @@
 
   bicep = {
     version = "0-unstable-2024-12-22";
-    url = "github:tree-sitter-grammars/tree-sitter-bicep/bff59884307c0ab009bd5e81afd9324b46a6c0f9";
+    url = "github:tree-sitter-grammars/tree-sitter-bicep";
+    rev = "bff59884307c0ab009bd5e81afd9324b46a6c0f9";
     hash = "sha256-+qvhJgYqs8aj/Kmojr7lmjbXmskwVvbYBn4ia9wOv3k=";
     meta = {
       license = lib.licenses.mit;
@@ -141,7 +149,8 @@
 
   blade = {
     version = "0-unstable-2025-08-25";
-    url = "github:EmranMR/tree-sitter-blade/cc764dadcbbceb3f259396fef66f970c72e94f96";
+    url = "github:EmranMR/tree-sitter-blade";
+    rev = "cc764dadcbbceb3f259396fef66f970c72e94f96";
     hash = "sha256-3/gY68F+xOF5Fv6rK9cEIJCVDzg/3ap1/gzkEacGuy4=";
     meta = {
       license = lib.licenses.mit;
@@ -153,7 +162,8 @@
 
   blueprint = {
     version = "0-unstable-2025-06-17";
-    url = "github:smrtrfszm/tree-sitter-blueprint/de66f283c6c9b7c270d766c2e4cf95535650ec48";
+    url = "github:smrtrfszm/tree-sitter-blueprint";
+    rev = "de66f283c6c9b7c270d766c2e4cf95535650ec48";
     hash = "sha256-zmMJZAxyKO42gIK3cWP/LuoPIo2+xr6fEDeHXknqa7M=";
     meta = {
       license = lib.licenses.mit;
@@ -189,7 +199,8 @@
 
   caddyfile = {
     version = "0-unstable-2025-12-16";
-    url = "github:caddyserver/tree-sitter-caddyfile/2b816940b5bf4f86c650aded24500cb5b682f1a1";
+    url = "github:caddyserver/tree-sitter-caddyfile";
+    rev = "2b816940b5bf4f86c650aded24500cb5b682f1a1";
     hash = "sha256-C/dTDm4X+VxtNZaqb2AHgcDZyGeBN9VMwZjSzJVEHGo=";
     meta = {
       license = lib.licenses.mit;
@@ -201,7 +212,8 @@
 
   cairo = {
     version = "0-unstable-2025-09-14";
-    url = "github:starkware-libs/tree-sitter-cairo/8dcd77dbe7f68b2cc661031dff224dfc17bdbaf4";
+    url = "github:starkware-libs/tree-sitter-cairo";
+    rev = "8dcd77dbe7f68b2cc661031dff224dfc17bdbaf4";
     hash = "sha256-RzxmMV0Uo4N25QuhMaTJHCA0sLE/51cfhd25LYFlFog=";
     meta = {
       license = lib.licenses.asl20;
@@ -213,7 +225,8 @@
 
   capnp = {
     version = "0-unstable-2024-04-20";
-    url = "github:amaanq/tree-sitter-capnp/7b0883c03e5edd34ef7bcf703194204299d7099f";
+    url = "github:amaanq/tree-sitter-capnp";
+    rev = "7b0883c03e5edd34ef7bcf703194204299d7099f";
     hash = "sha256-WKrZuOMxmdGlvUI9y8JgwCNMdJ8MULucMhkmW8JCiXM=";
     meta = {
       license = lib.licenses.mit;
@@ -225,7 +238,8 @@
 
   cel = {
     version = "0-unstable-2024-02-13";
-    url = "github:bufbuild/tree-sitter-cel/df0585025e6f50cdb07347f5009ae3f47c652890";
+    url = "github:bufbuild/tree-sitter-cel";
+    rev = "df0585025e6f50cdb07347f5009ae3f47c652890";
     hash = "sha256-Fyq56kzu1bL44QhrF3ZnKWgsoPRh3tjTRi2CynNQGfw=";
     meta = {
       license = lib.licenses.asl20;
@@ -237,7 +251,8 @@
 
   circom = {
     version = "0-unstable-2024-09-09";
-    url = "github:Decurity/tree-sitter-circom/02150524228b1e6afef96949f2d6b7cc0aaf999e";
+    url = "github:Decurity/tree-sitter-circom";
+    rev = "02150524228b1e6afef96949f2d6b7cc0aaf999e";
     hash = "sha256-wosqwiDkK1rytGWMJApz1M42Sme9OaWXC0rmj7vM4g8=";
     meta = {
       license = lib.licenses.mit;
@@ -249,7 +264,8 @@
 
   clarity = {
     version = "0-unstable-2025-11-17";
-    url = "github:xlittlerag/tree-sitter-clarity/cbb3ffe8688aca558286fd45ed46857a1f3207bb";
+    url = "github:xlittlerag/tree-sitter-clarity";
+    rev = "cbb3ffe8688aca558286fd45ed46857a1f3207bb";
     hash = "sha256-iylkAIBEpMPzRYHXyFQKMIEZJbqij/8tLdq9z/UPgN8=";
     meta = {
       license = lib.licenses.mit;
@@ -261,7 +277,8 @@
 
   clojure = {
     version = "0.0.13-unstable-2025-08-26";
-    url = "github:sogaiu/tree-sitter-clojure/e43eff80d17cf34852dcd92ca5e6986d23a7040f";
+    url = "github:sogaiu/tree-sitter-clojure";
+    rev = "e43eff80d17cf34852dcd92ca5e6986d23a7040f";
     hash = "sha256-jokekIuuQLx5UtuPs4XAI+euispeFCwSQByVKVelrC4=";
     meta = {
       license = lib.licenses.cc0;
@@ -297,7 +314,8 @@
 
   cpon = {
     version = "0-unstable-2023-06-06";
-    url = "github:fvacek/tree-sitter-cpon/d42786f6295db7046372c042b208b8094940e9cd";
+    url = "github:fvacek/tree-sitter-cpon";
+    rev = "d42786f6295db7046372c042b208b8094940e9cd";
     hash = "sha256-5Va7cnbumCQDNAhrYe2dCBhFmgZUQ6dCy4VjB4+JaTs=";
     meta = {
       license = lib.licenses.mit;
@@ -318,7 +336,8 @@
 
   crystal = {
     version = "0-unstable-2025-10-12";
-    url = "github:crystal-lang-tools/tree-sitter-crystal/50ca9e6fcfb16a2cbcad59203cfd8ad650e25c49";
+    url = "github:crystal-lang-tools/tree-sitter-crystal";
+    rev = "50ca9e6fcfb16a2cbcad59203cfd8ad650e25c49";
     hash = "sha256-xmQrplDxoJ8GhcTyCOuEGn4wwMM3/9M6tyM1dgRGARU=";
     meta = {
       license = lib.licenses.mit;
@@ -336,7 +355,8 @@
 
   csv = {
     version = "0-unstable-2025-03-13";
-    url = "github:weartist/rainbow-csv-tree-sitter/fbf125bcedb15080980e8afaf69c4374412e5844";
+    url = "github:weartist/rainbow-csv-tree-sitter";
+    rev = "fbf125bcedb15080980e8afaf69c4374412e5844";
     hash = "sha256-caWf6cIx0CcDP2u84ncfdTSlWvhVawnYAIW4m5bzRQY=";
     meta = {
       license = lib.licenses.mit;
@@ -366,7 +386,8 @@
 
   cylc = {
     version = "0-unstable-2025-09-08";
-    url = "github:elliotfontaine/tree-sitter-cylc/6d1d81137112299324b526477ce1db989ab58fb8";
+    url = "github:elliotfontaine/tree-sitter-cylc";
+    rev = "6d1d81137112299324b526477ce1db989ab58fb8";
     hash = "sha256-jgQCTM36S8UwSyT4LAfcX4DUIl2OYVMeQdDg3zRrw00=";
     meta = {
       license = lib.licenses.mit;
@@ -378,7 +399,8 @@
 
   d = {
     version = "0-unstable-2025-06-29";
-    url = "github:gdamore/tree-sitter-d/fb028c8f14f4188286c2eef143f105def6fbf24f";
+    url = "github:gdamore/tree-sitter-d";
+    rev = "fb028c8f14f4188286c2eef143f105def6fbf24f";
     hash = "sha256-Xi8out5j4L5pAArA9zmLA7aGhma++G+AaVLgFW+TEAo=";
     meta = {
       license = lib.licenses.mit;
@@ -390,7 +412,8 @@
 
   dart = {
     version = "0-unstable-2025-10-04";
-    url = "github:usernobody14/tree-sitter-dart/d4d8f3e337d8be23be27ffc35a0aef972343cd54";
+    url = "github:usernobody14/tree-sitter-dart";
+    rev = "d4d8f3e337d8be23be27ffc35a0aef972343cd54";
     hash = "sha256-1ftYqCor1A0PsQ0AJLVqtxVRZxaXqE/NZ5yy7SizZCY=";
     meta = {
       license = lib.licenses.mit;
@@ -399,7 +422,8 @@
 
   dbml = {
     version = "0-unstable-2023-11-02";
-    url = "github:dynamotn/tree-sitter-dbml/2e2fa5640268c33c3d3f27f7e676f631a9c68fd9";
+    url = "github:dynamotn/tree-sitter-dbml";
+    rev = "2e2fa5640268c33c3d3f27f7e676f631a9c68fd9";
     hash = "sha256-IxxUW6YYxP1hkwA9NEojEEE3c8pwvAI6juX8aF7NfMw=";
     meta = {
       license = lib.licenses.mit;
@@ -411,7 +435,8 @@
 
   debian = {
     version = "0-unstable-2025-04-01";
-    url = "gitlab:MggMuggins/tree-sitter-debian/9b3f4b78c45aab8a2f25a5f9e7bbc00995bc3dde";
+    url = "gitlab:MggMuggins/tree-sitter-debian";
+    rev = "9b3f4b78c45aab8a2f25a5f9e7bbc00995bc3dde";
     hash = "sha256-VjWoF5oI+K101xKvF+MDsy1+eCkkUytn39PHKqOCkjo=";
     meta = {
       license = lib.licenses.mit;
@@ -432,7 +457,8 @@
 
   dhall = {
     version = "0-unstable-2025-04-13";
-    url = "github:jbellerb/tree-sitter-dhall/62013259b26ac210d5de1abf64cf1b047ef88000";
+    url = "github:jbellerb/tree-sitter-dhall";
+    rev = "62013259b26ac210d5de1abf64cf1b047ef88000";
     hash = "sha256-4xbz7DDUlLGgLW5V6Yyvo7dkE9MOk3mCQEBTYyRbNuM=";
     meta = {
       license = lib.licenses.mit;
@@ -444,7 +470,8 @@
 
   diff = {
     version = "0-unstable-2025-10-29";
-    url = "github:the-mikedavis/tree-sitter-diff/2520c3f934b3179bb540d23e0ef45f75304b5fed";
+    url = "github:the-mikedavis/tree-sitter-diff";
+    rev = "2520c3f934b3179bb540d23e0ef45f75304b5fed";
     hash = "sha256-8rYLNGgoZSvvfqO2++nAgFKmvbkKJ3m+9B8bTXp6Us4=";
     meta = {
       license = lib.licenses.mit;
@@ -456,7 +483,8 @@
 
   djot = {
     version = "0-unstable-2025-09-15";
-    url = "github:treeman/tree-sitter-djot/74fac1f53c6d52aeac104b6874e5506be6d0cfe6";
+    url = "github:treeman/tree-sitter-djot";
+    rev = "74fac1f53c6d52aeac104b6874e5506be6d0cfe6";
     hash = "sha256-HfEZHNhxEbH07gDzLPdl6n2Pf//o8tbJvwE+tesJDC8=";
     meta = {
       license = lib.licenses.mit;
@@ -477,7 +505,8 @@
 
   dot = {
     version = "0-unstable-2025-10-21";
-    url = "github:rydesun/tree-sitter-dot/80327abbba6f47530edeb0df9f11bd5d5c93c14d";
+    url = "github:rydesun/tree-sitter-dot";
+    rev = "80327abbba6f47530edeb0df9f11bd5d5c93c14d";
     hash = "sha256-sepmaKnpbj/bgMBa06ksQFOMPtcCqGaINiJqFBJN/0Y=";
     meta = {
       license = lib.licenses.mit;
@@ -486,7 +515,8 @@
 
   dtd = {
     version = "0-unstable-2023-04-07";
-    url = "github:KMikeeU/tree-sitter-dtd/6116becb02a6b8e9588ef73d300a9ba4622e156f";
+    url = "github:KMikeeU/tree-sitter-dtd";
+    rev = "6116becb02a6b8e9588ef73d300a9ba4622e156f";
     hash = "sha256-mq617pfH/Na9JB8SDEudxbKJfaoezgjC3xVOIOZ8Qb8=";
     meta = {
       license = lib.licenses.mit;
@@ -498,7 +528,8 @@
 
   dunstrc = {
     version = "0-unstable-2025-05-04";
-    url = "github:rotmh/tree-sitter-dunstrc/9cb9d5cc51cf5e2a47bb2a0e2f2e519ff11c1431";
+    url = "github:rotmh/tree-sitter-dunstrc";
+    rev = "9cb9d5cc51cf5e2a47bb2a0e2f2e519ff11c1431";
     hash = "sha256-yfjOly1NvdNIFc3zzFb8XSCA+IW9uIzjtQRhf4/NQzY=";
     meta = {
       license = lib.licenses.mit;
@@ -510,7 +541,8 @@
 
   earthfile = {
     version = "0.6.0-unstable-2025-10-27";
-    url = "github:glehmann/tree-sitter-earthfile/5baef88717ad0156fd29a8b12d0d8245bb1096a8";
+    url = "github:glehmann/tree-sitter-earthfile";
+    rev = "5baef88717ad0156fd29a8b12d0d8245bb1096a8";
     hash = "sha256-eeXzc+thSPey7r59QkJd5jgchZRhSwT5isSljYLBQ8k=";
     meta = {
       license = lib.licenses.mit;
@@ -519,7 +551,8 @@
 
   edoc = {
     version = "0-unstable-2022-11-23";
-    url = "github:the-mikedavis/tree-sitter-edoc/74774af7b45dd9cefbf9510328fc6ff2374afc50";
+    url = "github:the-mikedavis/tree-sitter-edoc";
+    rev = "74774af7b45dd9cefbf9510328fc6ff2374afc50";
     hash = "sha256-ALGr1vI/R2gAgjHfwORYMP/+CeIejnSGqC9Db+GD5uM=";
     meta = {
       license = lib.licenses.mit;
@@ -567,7 +600,8 @@
 
   elvish = {
     version = "0-unstable-2023-07-17";
-    url = "github:ckafi/tree-sitter-elvish/5e7210d945425b77f82cbaebc5af4dd3e1ad40f5";
+    url = "github:ckafi/tree-sitter-elvish";
+    rev = "5e7210d945425b77f82cbaebc5af4dd3e1ad40f5";
     hash = "sha256-POuQA2Ihi+qDYQ5Pv7hBAzHpPu/FcnuYscW4ItDOCZg=";
     meta = {
       license = lib.licenses.bsd0;
@@ -597,7 +631,8 @@
 
   esdl = {
     version = "0-unstable-2024-03-28";
-    url = "github:greym0uth/tree-sitter-esdl/7e6692b2e2b4f73b03f1371e8d8b83f23bc1c6c8";
+    url = "github:greym0uth/tree-sitter-esdl";
+    rev = "7e6692b2e2b4f73b03f1371e8d8b83f23bc1c6c8";
     hash = "sha256-8vBpWfRl0yd0Tcsgq+wzcrajGbNJMc7qSq+YH/8A0cU=";
     meta = {
       license = lib.licenses.mit;
@@ -609,7 +644,8 @@
 
   factor = {
     version = "0-unstable-2025-01-12";
-    url = "github:erochest/tree-sitter-factor/554d8b705df61864eb41a0ecf3741e94eb9f0c54";
+    url = "github:erochest/tree-sitter-factor";
+    rev = "554d8b705df61864eb41a0ecf3741e94eb9f0c54";
     hash = "sha256-Z60ySUrBAiNm5s3iH/6jkjsKX5mPAW8bgid+5m2MzJM=";
     meta = {
       license = lib.licenses.mit;
@@ -618,7 +654,8 @@
 
   fennel = {
     version = "1.1.0-unstable-2025-09-07";
-    url = "github:travonted/tree-sitter-fennel/36eb796a84b4f57bdf159d0a99267260d4960c89";
+    url = "github:travonted/tree-sitter-fennel";
+    rev = "36eb796a84b4f57bdf159d0a99267260d4960c89";
     hash = "sha256-aFcTPgWkd/o1qu8d/hulmVDyFlTHJgb35iea4Jc1510=";
     meta = {
       license = lib.licenses.mit;
@@ -627,7 +664,8 @@
 
   fga = {
     version = "0-unstable-2025-12-17";
-    url = "github:matoous/tree-sitter-fga/e763d12cfd8569494215f304bc2b0074c84709e9";
+    url = "github:matoous/tree-sitter-fga";
+    rev = "e763d12cfd8569494215f304bc2b0074c84709e9";
     hash = "sha256-d1gvEoJosBcEiq4fxb+1LFcdSkuOWGXyG1cC44Lo19o=";
     meta = {
       license = lib.licenses.mit;
@@ -639,7 +677,8 @@
 
   fidl = {
     version = "0-unstable-2024-02-27";
-    url = "github:google/tree-sitter-fidl/0a8910f293268e27ff554357c229ba172b0eaed2";
+    url = "github:google/tree-sitter-fidl";
+    rev = "0a8910f293268e27ff554357c229ba172b0eaed2";
     hash = "sha256-QFAkxQo2w/+OR7nZn9ldBk2yHOd23kzciAcQvIZ5hrY=";
     meta = {
       license = lib.licenses.asl20;
@@ -660,7 +699,8 @@
 
   forth = {
     version = "0-unstable-2025-12-01";
-    url = "github:alexanderbrevig/tree-sitter-forth/360ef13f8c609ec6d2e80782af69958b84e36cd0";
+    url = "github:alexanderbrevig/tree-sitter-forth";
+    rev = "360ef13f8c609ec6d2e80782af69958b84e36cd0";
     hash = "sha256-d7X1Ubd9tKMQgNHlH+sQxmcsgLWB4mxR5CIdyKkLnM8=";
     meta = {
       license = lib.licenses.mit;
@@ -681,7 +721,8 @@
 
   fsharp = {
     version = "0-unstable-2025-07-05";
-    url = "github:ionide/tree-sitter-fsharp/5141851c278a99958469eb1736c7afc4ec738e47";
+    url = "github:ionide/tree-sitter-fsharp";
+    rev = "5141851c278a99958469eb1736c7afc4ec738e47";
     hash = "sha256-cJpbO9PjGtJu4RCDsmQ0qjys765/z397y/wbfGxTY9Y=";
     meta = {
       license = lib.licenses.mit;
@@ -693,7 +734,8 @@
 
   gas = {
     version = "0-unstable-2023-09-15";
-    url = "github:sirius94/tree-sitter-gas/60f443646b20edee3b7bf18f3a4fb91dc214259a";
+    url = "github:sirius94/tree-sitter-gas";
+    rev = "60f443646b20edee3b7bf18f3a4fb91dc214259a";
     hash = "sha256-HyLNnmK4jud2Ndkc+5MY9MlASh/ehPA/eQATsCVGcUw=";
     meta = {
       license = lib.licenses.gpl3Only;
@@ -723,7 +765,8 @@
 
   gherkin = {
     version = "0-unstable-2024-07-04";
-    url = "github:SamyAB/tree-sitter-gherkin/43873ee8de16476635b48d52c46f5b6407cb5c09";
+    url = "github:SamyAB/tree-sitter-gherkin";
+    rev = "43873ee8de16476635b48d52c46f5b6407cb5c09";
     hash = "sha256-6Ywu4HPfgpKsuZ6wo2b1CA3Z+lD+/3XEyJi2l2Q66+Y=";
     meta = {
       license = lib.licenses.mit;
@@ -735,7 +778,8 @@
 
   ghostty = {
     version = "0-unstable-2025-11-27";
-    url = "github:bezhermoso/tree-sitter-ghostty/c2f7af6d7250f63f01401a6d84b3e353e71ff3c3";
+    url = "github:bezhermoso/tree-sitter-ghostty";
+    rev = "c2f7af6d7250f63f01401a6d84b3e353e71ff3c3";
     hash = "sha256-d9cJWhEHiAMxyNhUt7VR5IU5z/5oXn3m9aMsknexaNM=";
     meta = {
       license = lib.licenses.mit;
@@ -747,7 +791,8 @@
 
   git-config = {
     version = "0-unstable-2025-05-11";
-    url = "github:the-mikedavis/tree-sitter-git-config/0fbc9f99d5a28865f9de8427fb0672d66f9d83a5";
+    url = "github:the-mikedavis/tree-sitter-git-config";
+    rev = "0fbc9f99d5a28865f9de8427fb0672d66f9d83a5";
     hash = "sha256-u1NrtCap+CvhSW4q7xrwiUPGuCspjk9sHKkXQcEXc2E=";
     meta = {
       license = lib.licenses.mit;
@@ -759,7 +804,8 @@
 
   git-rebase = {
     version = "0-unstable-2024-07-22";
-    url = "github:the-mikedavis/tree-sitter-git-rebase/bff4b66b44b020d918d67e2828eada1974a966aa";
+    url = "github:the-mikedavis/tree-sitter-git-rebase";
+    rev = "bff4b66b44b020d918d67e2828eada1974a966aa";
     hash = "sha256-k4C7dJUkvQxIxcaoVmG2cBs/CeYzVqrip2+2mRvHtZc=";
     meta = {
       license = lib.licenses.mit;
@@ -771,7 +817,8 @@
 
   gitattributes = {
     version = "0-unstable-2022-05-06";
-    url = "github:mtoohey31/tree-sitter-gitattributes/deb04fdbff485310ee5bac74ddc6ab624a602b7b";
+    url = "github:mtoohey31/tree-sitter-gitattributes";
+    rev = "deb04fdbff485310ee5bac74ddc6ab624a602b7b";
     hash = "sha256-4auPT/qeURtVMs+mi/zS4B08v0cMVkHOjSidV5FELO0=";
     meta = {
       license = lib.licenses.mit;
@@ -783,7 +830,8 @@
 
   gitcommit = {
     version = "0-unstable-2025-03-13";
-    url = "github:gbprod/tree-sitter-gitcommit/a716678c0f00645fed1e6f1d0eb221481dbd6f6d";
+    url = "github:gbprod/tree-sitter-gitcommit";
+    rev = "a716678c0f00645fed1e6f1d0eb221481dbd6f6d";
     hash = "sha256-KYfcs99p03b0RiPYnZeKJf677fmVf658FLZcFk2v2Ws=";
     meta = {
       license = lib.licenses.wtfpl;
@@ -795,7 +843,8 @@
 
   gitignore = {
     version = "0-unstable-2022-05-04";
-    url = "github:shunsambongi/tree-sitter-gitignore/f4685bf11ac466dd278449bcfe5fd014e94aa504";
+    url = "github:shunsambongi/tree-sitter-gitignore";
+    rev = "f4685bf11ac466dd278449bcfe5fd014e94aa504";
     hash = "sha256-MjoY1tlVZgN6JqoTjhhg0zSdHzc8yplMr8824sfIKp8=";
     meta = {
       license = lib.licenses.mit;
@@ -834,7 +883,8 @@
 
   gn = {
     version = "0-unstable-2023-12-10";
-    url = "github:willcassella/tree-sitter-gn/fbaa7b3d52b958e3ac06e15416e1785138bde063";
+    url = "github:willcassella/tree-sitter-gn";
+    rev = "fbaa7b3d52b958e3ac06e15416e1785138bde063";
     hash = "sha256-3OLlUL21YcdOZcnroPMwvMVJgu8bsGHldTnZh8y6q9M=";
     meta = {
       license = lib.licenses.asl20;
@@ -855,7 +905,8 @@
 
   go-template = {
     version = "0-unstable-2025-12-12";
-    url = "github:ngalaiko/tree-sitter-go-template/c59999dc449c29549f5735eaac31b938a13b6c14";
+    url = "github:ngalaiko/tree-sitter-go-template";
+    rev = "c59999dc449c29549f5735eaac31b938a13b6c14";
     hash = "sha256-YKqpNkCRLX+89Ottw4KVXxrEsIPRUsWs0UwIgucHwdo=";
   };
 
@@ -880,7 +931,8 @@
 
   gotmpl = {
     version = "0-unstable-2022-07-19";
-    url = "github:dannylongeuay/tree-sitter-go-template/395a33e08e69f4155156f0b90138a6c86764c979";
+    url = "github:dannylongeuay/tree-sitter-go-template";
+    rev = "395a33e08e69f4155156f0b90138a6c86764c979";
     hash = "sha256-YlPX74tEgCxGm2GYqYvQ0ouzTZ4x5/R+hkP+lBuOLGw=";
     meta = {
       license = lib.licenses.mit;
@@ -892,7 +944,8 @@
 
   gowork = {
     version = "0-unstable-2022-10-04";
-    url = "github:omertuc/tree-sitter-go-work/949a8a470559543857a62102c84700d291fc984c";
+    url = "github:omertuc/tree-sitter-go-work";
+    rev = "949a8a470559543857a62102c84700d291fc984c";
     hash = "sha256-Tode7W05xaOKKD5QOp3rayFgLEOiMJUeGpVsIrizxto=";
     meta = {
       license = lib.licenses.mit;
@@ -901,7 +954,8 @@
 
   gpr = {
     version = "0-unstable-2024-08-13";
-    url = "github:brownts/tree-sitter-gpr/cea857d3c18d1385d1f5b66cd09ea1e44173945c";
+    url = "github:brownts/tree-sitter-gpr";
+    rev = "cea857d3c18d1385d1f5b66cd09ea1e44173945c";
     hash = "sha256-tqff8Aaj9uebJeNYuNdaDBllsj/mwRStWhhY3zB8xlU=";
     meta = {
       license = lib.licenses.mit;
@@ -913,7 +967,8 @@
 
   graphql = {
     version = "0-unstable-2021-05-10";
-    url = "github:bkegley/tree-sitter-graphql/5e66e961eee421786bdda8495ed1db045e06b5fe";
+    url = "github:bkegley/tree-sitter-graphql";
+    rev = "5e66e961eee421786bdda8495ed1db045e06b5fe";
     hash = "sha256-NvE9Rpdp4sALqKSRWJpqxwl6obmqnIIdvrL1nK5peXc=";
     meta = {
       license = lib.licenses.mit;
@@ -922,7 +977,8 @@
 
   gren = {
     version = "0-unstable-2025-05-03";
-    url = "github:MaeBrooks/tree-sitter-gren/c36aac51a915fdfcaf178128ba1e9c2205b25930";
+    url = "github:MaeBrooks/tree-sitter-gren";
+    rev = "c36aac51a915fdfcaf178128ba1e9c2205b25930";
     hash = "sha256-XtLP2ncpwAiubHug6k4sJCYRZo5f+Nu02tho/4tVD/k=";
     meta = {
       license = lib.licenses.mit;
@@ -934,7 +990,8 @@
 
   groovy = {
     version = "0-unstable-2025-01-22";
-    url = "github:murtaza64/tree-sitter-groovy/86911590a8e46d71301c66468e5620d9faa5b6af";
+    url = "github:murtaza64/tree-sitter-groovy";
+    rev = "86911590a8e46d71301c66468e5620d9faa5b6af";
     hash = "sha256-652wluH2C3pYmhthaj4eWDVLtEvvVIuu70bJNnt5em0=";
     meta = {
       license = lib.licenses.mit;
@@ -946,7 +1003,8 @@
 
   hare = {
     version = "0-unstable-2024-07-30";
-    url = "sourcehut:~ecs/tree-sitter-hare/fb6ea01461441ec7c312e64e326649f5e9011a64";
+    url = "sourcehut:~ecs/tree-sitter-hare";
+    rev = "fb6ea01461441ec7c312e64e326649f5e9011a64";
     hash = "sha256-KQ9U3XWzqS0ozTHpaLpAIvK8T8ilbV1ex6CLFzHXPzA=";
     meta = {
       license = lib.licenses.mit;
@@ -967,7 +1025,8 @@
 
   haskell-persistent = {
     version = "0-unstable-2023-09-19";
-    url = "github:MercuryTechnologies/tree-sitter-haskell-persistent/577259b4068b2c281c9ebf94c109bd50a74d5857";
+    url = "github:MercuryTechnologies/tree-sitter-haskell-persistent";
+    rev = "577259b4068b2c281c9ebf94c109bd50a74d5857";
     hash = "sha256-ASdkBQ57GfpLF8NXgDzJMB/Marz9p1q03TZkwMgF/eQ=";
     meta = {
       license = lib.licenses.mit;
@@ -997,7 +1056,8 @@
 
   hjson = {
     version = "0-unstable-2021-08-02";
-    url = "github:winston0410/tree-sitter-hjson/02fa3b79b3ff9a296066da6277adfc3f26cbc9e0";
+    url = "github:winston0410/tree-sitter-hjson";
+    rev = "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0";
     hash = "sha256-NsTf3DR3gHVMYZDmTNvThB5bJcDwTcJ1+3eJhvsiDn8=";
     meta = {
       license = lib.licenses.mit;
@@ -1006,7 +1066,8 @@
 
   hocon = {
     version = "0-unstable-2022-11-07";
-    url = "github:antosha417/tree-sitter-hocon/c390f10519ae69fdb03b3e5764f5592fb6924bcc";
+    url = "github:antosha417/tree-sitter-hocon";
+    rev = "c390f10519ae69fdb03b3e5764f5592fb6924bcc";
     hash = "sha256-9Zo3YYoo9mJ4Buyj7ofSrlZURrwstBo0vgzeTq1jMGw=";
     meta = {
       license = lib.licenses.mit;
@@ -1018,7 +1079,8 @@
 
   hoon = {
     version = "0-unstable-2024-12-17";
-    url = "github:urbit-pilled/tree-sitter-hoon/1545137aadcc63660c47db9ad98d02fa602655d0";
+    url = "github:urbit-pilled/tree-sitter-hoon";
+    rev = "1545137aadcc63660c47db9ad98d02fa602655d0";
     hash = "sha256-RkSPoscrinmuSTWHzXkRNaiqECDXpKAbQ4z7a6Tpvek=";
     meta = {
       license = lib.licenses.bsd3;
@@ -1030,7 +1092,8 @@
 
   hosts = {
     version = "0-unstable-2022-12-01";
-    url = "github:ath3/tree-sitter-hosts/301b9379ce7dfc8bdbe2c2699a6887dcb73953f9";
+    url = "github:ath3/tree-sitter-hosts";
+    rev = "301b9379ce7dfc8bdbe2c2699a6887dcb73953f9";
     hash = "sha256-f8ldDZD0I/D8IC566bZ4YgQE/b0maTE3BfzuzPfy92k=";
     meta = {
       license = lib.licenses.unlicense;
@@ -1051,7 +1114,8 @@
 
   htmldjango = {
     version = "0-unstable-2025-04-16";
-    url = "github:interdependence/tree-sitter-htmldjango/3a643167ad9afac5d61e092f08ff5b054576fadf";
+    url = "github:interdependence/tree-sitter-htmldjango";
+    rev = "3a643167ad9afac5d61e092f08ff5b054576fadf";
     hash = "sha256-sQV7olTaQ68wixzvKV44myVvDUXXjBZh9N3jvDFUSvE=";
     meta = {
       license = lib.licenses.mit;
@@ -1072,7 +1136,8 @@
 
   hurl = {
     version = "0-unstable-2025-09-13";
-    url = "github:pfeiferj/tree-sitter-hurl/597efbd7ce9a814bb058f48eabd055b1d1e12145";
+    url = "github:pfeiferj/tree-sitter-hurl";
+    rev = "597efbd7ce9a814bb058f48eabd055b1d1e12145";
     hash = "sha256-sQjjx3DGfi0l8/XNOIoyFYAcDpaQOkD4Ics3g6vkgjM=";
     meta = {
       license = lib.licenses.asl20;
@@ -1093,7 +1158,8 @@
 
   iex = {
     version = "0-unstable-2022-01-08";
-    url = "github:elixir-lang/tree-sitter-iex/39f20bb51f502e32058684e893c0c0b00bb2332c";
+    url = "github:elixir-lang/tree-sitter-iex";
+    rev = "39f20bb51f502e32058684e893c0c0b00bb2332c";
     hash = "sha256-YRVxMz9VqZ00bG0tQ/IDxf/8UkK3/OYZTIMxsQfknII=";
     meta = {
       license = lib.licenses.asl20;
@@ -1105,7 +1171,8 @@
 
   ini = {
     version = "0-unstable-2025-12-08";
-    url = "github:justinmk/tree-sitter-ini/e4018b5176132b4f3c5d6e61cea383f42288d0f5";
+    url = "github:justinmk/tree-sitter-ini";
+    rev = "e4018b5176132b4f3c5d6e61cea383f42288d0f5";
     hash = "sha256-8WCyIaApsLPOybe+cntF4ISyQKN41L2IRAATd9KmzL0=";
     meta = {
       license = lib.licenses.asl20;
@@ -1117,7 +1184,8 @@
 
   ink = {
     version = "0-unstable-2025-02-05";
-    url = "github:rhizoome/tree-sitter-ink/3bafa20b888b97a505164fa9ee3812c331b2b809";
+    url = "github:rhizoome/tree-sitter-ink";
+    rev = "3bafa20b888b97a505164fa9ee3812c331b2b809";
     hash = "sha256-i+e+eaiAzTx2n9A0mlQ1SStGTbcS4LQJfmK8uNpzNiI=";
     meta = {
       license = lib.licenses.asl20;
@@ -1129,7 +1197,8 @@
 
   inko = {
     version = "0-unstable-2025-12-06";
-    url = "github:inko-lang/tree-sitter-inko/20e2842680dd0d47dd2ee976bc320e4399f65fe1";
+    url = "github:inko-lang/tree-sitter-inko";
+    rev = "20e2842680dd0d47dd2ee976bc320e4399f65fe1";
     hash = "sha256-qgB2s/ghmOGjJ+MH7p3ZQKa+RMxx58642Z9lYC1wlq4=";
     meta = {
       license = lib.licenses.mpl20;
@@ -1141,7 +1210,8 @@
 
   janet-simple = {
     version = "0.0.7-unstable-2025-05-19";
-    url = "github:sogaiu/tree-sitter-janet-simple/7e28cbf1ca061887ea43591a2898001f4245fddf";
+    url = "github:sogaiu/tree-sitter-janet-simple";
+    rev = "7e28cbf1ca061887ea43591a2898001f4245fddf";
     hash = "sha256-qWsUPZfQkuEUiuCSsqs92MIMEvdD+q2bwKir3oE5thc=";
     meta = {
       license = lib.licenses.cc0;
@@ -1168,7 +1238,8 @@
 
   jinja2 = {
     version = "0-unstable-2023-02-09";
-    url = "github:varpeti/tree-sitter-jinja2/a533cd3c33aea6acb0f9bf9a56f35dcfe6a8eb53";
+    url = "github:varpeti/tree-sitter-jinja2";
+    rev = "a533cd3c33aea6acb0f9bf9a56f35dcfe6a8eb53";
     hash = "sha256-ksHel/kkWk4cyCx/+k8IfqjnID8i744WsZi9+AVSNpw=";
     meta = {
       license = lib.licenses.gpl3Only;
@@ -1180,7 +1251,8 @@
 
   jjdescription = {
     version = "0-unstable-2025-02-20";
-    url = "github:kareigu/tree-sitter-jjdescription/1613b8c85b6ead48464d73668f39910dcbb41911";
+    url = "github:kareigu/tree-sitter-jjdescription";
+    rev = "1613b8c85b6ead48464d73668f39910dcbb41911";
     hash = "sha256-HPghz3mOukXrY0KQllOR7Kkl2U3+ukPBrXWKnJCwsqI=";
     meta = {
       license = lib.licenses.mit;
@@ -1192,7 +1264,8 @@
 
   jq = {
     version = "0-unstable-2025-05-10";
-    url = "github:flurie/tree-sitter-jq/c204e36d2c3c6fce1f57950b12cabcc24e5cc4d9";
+    url = "github:flurie/tree-sitter-jq";
+    rev = "c204e36d2c3c6fce1f57950b12cabcc24e5cc4d9";
     hash = "sha256-WEsiDsZEFTGC3s0awYE8rN/fsRML7CePKOXUbL+Fujc=";
     meta = {
       license = lib.licenses.bsd3;
@@ -1231,7 +1304,8 @@
 
   jsonnet = {
     version = "0-unstable-2024-08-15";
-    url = "github:sourcegraph/tree-sitter-jsonnet/ddd075f1939aed8147b7aa67f042eda3fce22790";
+    url = "github:sourcegraph/tree-sitter-jsonnet";
+    rev = "ddd075f1939aed8147b7aa67f042eda3fce22790";
     hash = "sha256-ODGRkirfUG8DqV6ZcGRjKeCyEtsU0r+ICK0kCG6Xza0=";
     meta = {
       license = lib.licenses.mit;
@@ -1249,7 +1323,8 @@
 
   just = {
     version = "0-unstable-2025-01-05";
-    url = "github:IndianBoy42/tree-sitter-just/bb0c898a80644de438e6efe5d88d30bf092935cd";
+    url = "github:IndianBoy42/tree-sitter-just";
+    rev = "bb0c898a80644de438e6efe5d88d30bf092935cd";
     hash = "sha256-FwEuH/2R745jsuFaVGNeUTv65xW+MPjbcakRNcAWfZU=";
     meta = {
       license = lib.licenses.asl20;
@@ -1267,7 +1342,8 @@
 
   koka = {
     version = "0-unstable-2025-07-26";
-    url = "github:mtoohey31/tree-sitter-koka/6dce132911ac375ac1a3591c868c47a2a84b30aa";
+    url = "github:mtoohey31/tree-sitter-koka";
+    rev = "6dce132911ac375ac1a3591c868c47a2a84b30aa";
     hash = "sha256-QXKfXg1qs3HNvjk1J8Kzm6uwR0frXXEONlJQPCqioNA=";
     meta = {
       license = lib.licenses.mit;
@@ -1285,7 +1361,8 @@
 
   koto = {
     version = "0-unstable-2025-11-17";
-    url = "github:koto-lang/tree-sitter-koto/f8b3f62c0eed185dca1559789e78759d4bee60e5";
+    url = "github:koto-lang/tree-sitter-koto";
+    rev = "f8b3f62c0eed185dca1559789e78759d4bee60e5";
     hash = "sha256-vv5HMDXMcSi91loIppsx/5Hu6jJ7/cedtTyahOBP780=";
     meta = {
       license = lib.licenses.mit;
@@ -1307,7 +1384,8 @@
 
   ld = {
     version = "0-unstable-2024-04-12";
-    url = "github:mtoohey31/tree-sitter-ld/0e9695ae0ede47b8744a8e2ad44d4d40c5d4e4c9";
+    url = "github:mtoohey31/tree-sitter-ld";
+    rev = "0e9695ae0ede47b8744a8e2ad44d4d40c5d4e4c9";
     hash = "sha256-U+yqSO+vo1RAZrCqCojhY4HwjcjirZU/HgWDCdw3YGw=";
     meta = {
       license = lib.licenses.mit;
@@ -1319,7 +1397,8 @@
 
   ldif = {
     version = "0-unstable-2023-05-27";
-    url = "github:kepet19/tree-sitter-ldif/0a917207f65ba3e3acfa9cda16142ee39c4c1aaa";
+    url = "github:kepet19/tree-sitter-ldif";
+    rev = "0a917207f65ba3e3acfa9cda16142ee39c4c1aaa";
     hash = "sha256-xivgajrM0sqbEcX+ZN0h5C+s7KJVJanrvxRQ/j1VNIQ=";
     meta = {
       license = lib.licenses.mit;
@@ -1331,7 +1410,8 @@
 
   lean = {
     version = "0-unstable-2024-12-25";
-    url = "github:Julian/tree-sitter-lean/efe6b87145608d12f5996bd7f0cf6095a0e82261";
+    url = "github:Julian/tree-sitter-lean";
+    rev = "efe6b87145608d12f5996bd7f0cf6095a0e82261";
     hash = "sha256-MF+LRzhDw3V/l/h11ZTyWCUCm3b+g0oyOdaCZMVlJc4=";
     meta = {
       license = lib.licenses.mit;
@@ -1343,7 +1423,8 @@
 
   ledger = {
     version = "0-unstable-2025-05-04";
-    url = "github:cbarrete/tree-sitter-ledger/96c92d4908a836bf8f661166721c98439f8afb80";
+    url = "github:cbarrete/tree-sitter-ledger";
+    rev = "96c92d4908a836bf8f661166721c98439f8afb80";
     hash = "sha256-L2xUTItnQ/bcieasItrozjAEJLm/fsUUyMex2juCnjw=";
     meta = {
       license = lib.licenses.mit;
@@ -1352,7 +1433,8 @@
 
   llvm = {
     version = "0-unstable-2024-10-07";
-    url = "github:benwilliamgraham/tree-sitter-llvm/c14cb839003348692158b845db9edda201374548";
+    url = "github:benwilliamgraham/tree-sitter-llvm";
+    rev = "c14cb839003348692158b845db9edda201374548";
     hash = "sha256-L3XwPhvwIR/mUbugMbaHS9dXyhO7bApv/gdlxQ+2Bbo=";
     meta = {
       license = lib.licenses.mit;
@@ -1361,7 +1443,8 @@
 
   llvm-mir = {
     version = "0-unstable-2024-10-03";
-    url = "github:Flakebi/tree-sitter-llvm-mir/d166ff8c5950f80b0a476956e7a0ad2f27c12505";
+    url = "github:Flakebi/tree-sitter-llvm-mir";
+    rev = "d166ff8c5950f80b0a476956e7a0ad2f27c12505";
     hash = "sha256-ivslvFNr3550Grko9xbHPtA63XNc+twFfZQFhBmPaME=";
     meta = {
       license = lib.licenses.mit;
@@ -1373,7 +1456,8 @@
 
   log = {
     version = "0-unstable-2023-11-26";
-    url = "github:Tudyx/tree-sitter-log/62cfe307e942af3417171243b599cc7deac5eab9";
+    url = "github:Tudyx/tree-sitter-log";
+    rev = "62cfe307e942af3417171243b599cc7deac5eab9";
     hash = "sha256-lvN2it+pNyYvGIqtRI+zUZwPrj/3SLMZX9zordYg3IU=";
     meta = {
       license = lib.licenses.mit;
@@ -1385,7 +1469,8 @@
 
   lpf = {
     version = "0-unstable-2023-10-13";
-    url = "gitlab:TheZoq2/tree-sitter-lpf/db7372e60c722ca7f12ab359e57e6bf7611ab126";
+    url = "gitlab:TheZoq2/tree-sitter-lpf";
+    rev = "db7372e60c722ca7f12ab359e57e6bf7611ab126";
     hash = "sha256-Y+W4Ceb0+gUJbBC9ziy672not6zc8JVIGTWYsPmWk7c=";
     meta = {
       license = lib.licenses.isc;
@@ -1397,7 +1482,8 @@
 
   lua = {
     version = "0.0.19-unstable-2025-05-16";
-    url = "github:MunifTanjim/tree-sitter-lua/4fbec840c34149b7d5fe10097c93a320ee4af053";
+    url = "github:MunifTanjim/tree-sitter-lua";
+    rev = "4fbec840c34149b7d5fe10097c93a320ee4af053";
     hash = "sha256-fO8XqlauYiPR0KaFzlAzvkrYXgEsiSzlB3xYzUpcbrs=";
     meta = {
       license = lib.licenses.mit;
@@ -1406,7 +1492,8 @@
 
   luau = {
     version = "0-unstable-2025-12-08";
-    url = "github:polychromatist/tree-sitter-luau/71b03e66b2c8dd04e0133c9b998a54a58f239ca4";
+    url = "github:polychromatist/tree-sitter-luau";
+    rev = "71b03e66b2c8dd04e0133c9b998a54a58f239ca4";
     hash = "sha256-aXoq9NvJDzQLSuyanFL8dQepxTyK/k5y0APAJn1DZKI=";
     meta = {
       license = lib.licenses.mit;
@@ -1418,7 +1505,8 @@
 
   mail = {
     version = "0-unstable-2025-04-09";
-    url = "github:ficcdaf/tree-sitter-mail/c84126474aee00ce67c32229710a4e1e09827a08";
+    url = "github:ficcdaf/tree-sitter-mail";
+    rev = "c84126474aee00ce67c32229710a4e1e09827a08";
     hash = "sha256-qqy7jsqsWVUlRuk+Cv+n3sEiH/SlO5/4Q+mrcftFKP4=";
     meta = {
       license = lib.licenses.mit;
@@ -1430,7 +1518,8 @@
 
   make = {
     version = "0-unstable-2021-12-16";
-    url = "github:alemuller/tree-sitter-make/a4b9187417d6be349ee5fd4b6e77b4172c6827dd";
+    url = "github:alemuller/tree-sitter-make";
+    rev = "a4b9187417d6be349ee5fd4b6e77b4172c6827dd";
     hash = "sha256-qQqapnKKH5X8rkxbZG5PjnyxvnpyZHpFVi/CLkIn/x0=";
     meta = {
       license = lib.licenses.mit;
@@ -1439,7 +1528,8 @@
 
   markdoc = {
     version = "0-unstable-2024-10-06";
-    url = "github:markdoc-extra/tree-sitter-markdoc/e4211fe541a13350275e4684de79adfebe9a91f8";
+    url = "github:markdoc-extra/tree-sitter-markdoc";
+    rev = "e4211fe541a13350275e4684de79adfebe9a91f8";
     hash = "sha256-WFFrpvulhT9Z0L+zAgZQGIzcg3YxkcJpLfNeqpf3afI=";
     meta = {
       license = lib.licenses.mit;
@@ -1472,7 +1562,8 @@
 
   matlab = {
     version = "0-unstable-2025-11-22";
-    url = "github:acristoffers/tree-sitter-matlab/1bccabdbd420a9c3c3f96f36d7f9e65b3d9c88ef";
+    url = "github:acristoffers/tree-sitter-matlab";
+    rev = "1bccabdbd420a9c3c3f96f36d7f9e65b3d9c88ef";
     hash = "sha256-V7GOXiR//JgxjTOxRi+PpfRGvunX4r3C0Bu1CrN+/K4=";
     meta = {
       license = lib.licenses.mit;
@@ -1484,7 +1575,8 @@
 
   mermaid = {
     version = "0-unstable-2024-04-22";
-    url = "github:monaqa/tree-sitter-mermaid/90ae195b31933ceb9d079abfa8a3ad0a36fee4cc";
+    url = "github:monaqa/tree-sitter-mermaid";
+    rev = "90ae195b31933ceb9d079abfa8a3ad0a36fee4cc";
     hash = "sha256-Tt1bPqpL59FQzuI8CPljBmQoAfJPUkVC9Xe1GcfXzfE=";
     meta = {
       license = lib.licenses.mit;
@@ -1496,7 +1588,8 @@
 
   meson = {
     version = "0-unstable-2022-11-02";
-    url = "github:staysail/tree-sitter-meson/1a497eecfb1b840ab12caf28f0ef45d4a5e26d28";
+    url = "github:staysail/tree-sitter-meson";
+    rev = "1a497eecfb1b840ab12caf28f0ef45d4a5e26d28";
     hash = "sha256-VWI4q85uOzT/n/tWYAMgGWdK1q3BAAuwC4WjErE82xk=";
     meta = {
       license = lib.licenses.mit;
@@ -1508,7 +1601,8 @@
 
   mojo = {
     version = "0-unstable-2024-12-07";
-    url = "github:lsh/tree-sitter-mojo/564d5a8489e20e5f723020ae40308888699055c0";
+    url = "github:lsh/tree-sitter-mojo";
+    rev = "564d5a8489e20e5f723020ae40308888699055c0";
     hash = "sha256-UY4gTG9HI/agpD+2syb7lUqfZpw6I6UnKzs9zE9JFwA=";
     meta = {
       license = lib.licenses.mit;
@@ -1520,7 +1614,8 @@
 
   move = {
     version = "0-unstable-2025-06-17";
-    url = "github:tzakian/tree-sitter-move/640ee15e4a7b0d09a4bc95dcc71336c28d97999b";
+    url = "github:tzakian/tree-sitter-move";
+    rev = "640ee15e4a7b0d09a4bc95dcc71336c28d97999b";
     hash = "sha256-rLIyJZEjMRo8am+ivKCwAESvv6jFtTPYJuuebN3T5Es=";
     meta = {
       maintainers = with lib.maintainers; [
@@ -1531,7 +1626,8 @@
 
   nasm = {
     version = "0-unstable-2024-11-23";
-    url = "github:naclsn/tree-sitter-nasm/d1b3638d017f2a8585e26dcfc66fe1df94185e30";
+    url = "github:naclsn/tree-sitter-nasm";
+    rev = "d1b3638d017f2a8585e26dcfc66fe1df94185e30";
     hash = "sha256-38yRvaSkHZ7iRmHlXdCssJtd/RQRfBB437HzBwWv2mg=";
     meta = {
       license = lib.licenses.mit;
@@ -1552,7 +1648,8 @@
 
   nginx = {
     version = "0-unstable-2024-10-15";
-    url = "gitlab:joncoole/tree-sitter-nginx/f6d13cf6281b25f2ce342a49a41a10a0381e00f0";
+    url = "gitlab:joncoole/tree-sitter-nginx";
+    rev = "f6d13cf6281b25f2ce342a49a41a10a0381e00f0";
     hash = "sha256-ofFBxW4p7rZFZm9w5cyA0semYLJWFu9emv8bfTfAFok=";
     meta = {
       license = lib.licenses.gpl3;
@@ -1573,7 +1670,8 @@
 
   nim = {
     version = "0-unstable-2025-07-29";
-    url = "github:alaviss/tree-sitter-nim/4ad352773688deb84a95eeaa9872acda5b466439";
+    url = "github:alaviss/tree-sitter-nim";
+    rev = "4ad352773688deb84a95eeaa9872acda5b466439";
     hash = "sha256-dinMmbD36o1QkcLk2mgycgHZ9sW5Mg6lfnxssynaj58=";
     meta = {
       license = lib.licenses.mpl20;
@@ -1585,7 +1683,8 @@
 
   nix = {
     version = "0.3.0-unstable-2025-12-03";
-    url = "github:nix-community/tree-sitter-nix/eabf96807ea4ab6d6c7f09b671a88cd483542840";
+    url = "github:nix-community/tree-sitter-nix";
+    rev = "eabf96807ea4ab6d6c7f09b671a88cd483542840";
     hash = "sha256-cSiBd0XkSR8l1CF2vkThWUtMxqATwuxCNO5oy2kyOZY=";
     meta = {
       license = lib.licenses.mit;
@@ -1609,7 +1708,8 @@
 
   nu = {
     version = "0-unstable-2025-12-13";
-    url = "github:nushell/tree-sitter-nu/4c149627cc592560f77ead1c384e27ec85926407";
+    url = "github:nushell/tree-sitter-nu";
+    rev = "4c149627cc592560f77ead1c384e27ec85926407";
     hash = "sha256-h02kb3VxSK/fxQENtj2yaRmAQ5I8rt5s5R8VrWOQWeo=";
     meta = {
       license = lib.licenses.mit;
@@ -1637,7 +1737,8 @@
 
   odin = {
     version = "0-unstable-2025-01-12";
-    url = "github:tree-sitter-grammars/tree-sitter-odin/d2ca8efb4487e156a60d5bd6db2598b872629403";
+    url = "github:tree-sitter-grammars/tree-sitter-odin";
+    rev = "d2ca8efb4487e156a60d5bd6db2598b872629403";
     hash = "sha256-aPeaGERAP1Fav2QAjZy1zXciCuUTQYrsqXaSQsYG0oU=";
     meta = {
       license = lib.licenses.mit;
@@ -1649,7 +1750,8 @@
 
   ohm = {
     version = "0-unstable-2025-12-12";
-    url = "github:novusnota/tree-sitter-ohm/a1de3e748a185a335b446613aaeff1eb10e83cdf";
+    url = "github:novusnota/tree-sitter-ohm";
+    rev = "a1de3e748a185a335b446613aaeff1eb10e83cdf";
     hash = "sha256-phH6FHdP9ycVXSzsON0/IyEuqkR65/8cNxJcTOBr3JE=";
     meta = {
       license = lib.licenses.mit;
@@ -1661,7 +1763,8 @@
 
   opencl = {
     version = "0-unstable-2023-03-30";
-    url = "github:lefp/tree-sitter-opencl/8e1d24a57066b3cd1bb9685bbc1ca9de5c1b78fb";
+    url = "github:lefp/tree-sitter-opencl";
+    rev = "8e1d24a57066b3cd1bb9685bbc1ca9de5c1b78fb";
     hash = "sha256-tymKOBQbbXAI4bUDSOnZaMoyhFuDwSInvqgGq0eTDl8=";
     meta = {
       license = lib.licenses.mit;
@@ -1673,7 +1776,8 @@
 
   openscad = {
     version = "0-unstable-2025-11-25";
-    url = "github:openscad/tree-sitter-openscad/09ed1478aa98a11df06367e91f2d310e334e39fb";
+    url = "github:openscad/tree-sitter-openscad";
+    rev = "09ed1478aa98a11df06367e91f2d310e334e39fb";
     hash = "sha256-tRBUGfcEdEnym1mrpPs7YdWvbBgeLQoZLgb47XtoGd8=";
     meta = {
       license = lib.licenses.mit;
@@ -1685,7 +1789,8 @@
 
   org = {
     version = "0-unstable-2023-06-19";
-    url = "github:milisims/tree-sitter-org/64cfbc213f5a83da17632c95382a5a0a2f3357c1";
+    url = "github:milisims/tree-sitter-org";
+    rev = "64cfbc213f5a83da17632c95382a5a0a2f3357c1";
     hash = "sha256-/03eZBbv23W5s/GbDgPgaJV5TyK+/lrWUVeINRS5wtA=";
     meta = {
       license = lib.licenses.mit;
@@ -1697,7 +1802,8 @@
 
   org-nvim = {
     version = "1.3.1-unstable-2023-06-19";
-    url = "github:emiasims/tree-sitter-org/64cfbc213f5a83da17632c95382a5a0a2f3357c1";
+    url = "github:emiasims/tree-sitter-org";
+    rev = "64cfbc213f5a83da17632c95382a5a0a2f3357c1";
     hash = "sha256-/03eZBbv23W5s/GbDgPgaJV5TyK+/lrWUVeINRS5wtA=";
     meta = {
       license = lib.licenses.mit;
@@ -1706,7 +1812,8 @@
 
   pascal = {
     version = "0-unstable-2025-05-17";
-    url = "github:Isopod/tree-sitter-pascal/5054931bcd022860dd5936864f981e359fb63aef";
+    url = "github:Isopod/tree-sitter-pascal";
+    rev = "5054931bcd022860dd5936864f981e359fb63aef";
     hash = "sha256-+5HzlNL54/Wdr7b1vRwZzIU3Z8vqFP9FzmEO1qwxJrk=";
     meta = {
       license = lib.licenses.mit;
@@ -1718,7 +1825,8 @@
 
   passwd = {
     version = "0-unstable-2022-12-01";
-    url = "github:ath3/tree-sitter-passwd/20239395eacdc2e0923a7e5683ad3605aee7b716";
+    url = "github:ath3/tree-sitter-passwd";
+    rev = "20239395eacdc2e0923a7e5683ad3605aee7b716";
     hash = "sha256-3UfuyJeblQBKjqZvLYyO3GoCvYJp+DvBwQGkR3pFQQ4=";
     meta = {
       license = lib.licenses.unlicense;
@@ -1730,7 +1838,8 @@
 
   pem = {
     version = "0-unstable-2023-02-05";
-    url = "github:mtoohey31/tree-sitter-pem/62842ea106ff66876f9af4cccdf87913d1ed912e";
+    url = "github:mtoohey31/tree-sitter-pem";
+    rev = "62842ea106ff66876f9af4cccdf87913d1ed912e";
     hash = "sha256-yxxm3Iu3FQxdWM0d2VeptZj/ePTa58NFhLgYBzaeSeU=";
     meta = {
       license = lib.licenses.mit;
@@ -1751,7 +1860,8 @@
 
   pest = {
     version = "0-unstable-2025-10-06";
-    url = "github:pest-parser/tree-sitter-pest/c19629a0c50e6ca2485c3b154b1dde841a08d169";
+    url = "github:pest-parser/tree-sitter-pest";
+    rev = "c19629a0c50e6ca2485c3b154b1dde841a08d169";
     hash = "sha256-S5qg/LLPlMmNtRTTi7vW8y/c+zcId7ADmMqIt0gqJBo=";
     meta = {
       license = lib.licenses.mit;
@@ -1793,7 +1903,8 @@
 
   php-only = {
     version = "0-unstable-2025-11-24";
-    url = "github:tree-sitter/tree-sitter-php/7d07b41ce2d442ca9a90ed85d0075eccc17ae315";
+    url = "github:tree-sitter/tree-sitter-php";
+    rev = "7d07b41ce2d442ca9a90ed85d0075eccc17ae315";
     hash = "sha256-XEKlsqC7HJ3mShmcwmfpezNP9DHE8f73f7/ru4MuxEo=";
     meta = {
       license = lib.licenses.mit;
@@ -1805,7 +1916,8 @@
 
   pioasm = {
     version = "0-unstable-2024-10-12";
-    url = "github:leo60228/tree-sitter-pioasm/afece58efdb30440bddd151ef1347fa8d6f744a9";
+    url = "github:leo60228/tree-sitter-pioasm";
+    rev = "afece58efdb30440bddd151ef1347fa8d6f744a9";
     hash = "sha256-rUuolF/jPJGiqunD6SLUJ0x/MTIJ+mJ1QSBCasUw5T8=";
     meta = {
       license = lib.licenses.isc;
@@ -1814,7 +1926,8 @@
 
   pkl = {
     version = "0-unstable-2025-12-12";
-    url = "github:apple/tree-sitter-pkl/ac58931956c000d3aeefbb55a81fc3c5bd6aecf0";
+    url = "github:apple/tree-sitter-pkl";
+    rev = "ac58931956c000d3aeefbb55a81fc3c5bd6aecf0";
     hash = "sha256-R0p9ceNjd9xnikxaCjDFwN4HkfRr+4ezVSlXqLP/YuQ=";
     meta = {
       license = lib.licenses.asl20;
@@ -1826,7 +1939,8 @@
 
   po = {
     version = "0-unstable-2024-04-20";
-    url = "github:erasin/tree-sitter-po/bd860a0f57f697162bf28e576674be9c1500db5e";
+    url = "github:erasin/tree-sitter-po";
+    rev = "bd860a0f57f697162bf28e576674be9c1500db5e";
     hash = "sha256-/St0VxDTAF872ZlBph1TukRoO0PBIOMT0D11DZ6nSLQ=";
     meta = {
       license = lib.licenses.mit;
@@ -1839,6 +1953,7 @@
   pod = {
     version = "0-unstable-2024-08-23";
     url = "github:tree-sitter-perl/tree-sitter-pod/release";
+    rev = "0bf8387987c21bf2f8ed41d2575a8f22b139687f";
     hash = "sha256-yV2kVAxWxdyIJ3g2oivDc01SAQF0lc7UMT2sfv9lKzI=";
 
     meta = {
@@ -1851,7 +1966,8 @@
 
   ponylang = {
     version = "0-unstable-2023-03-13";
-    url = "github:mfelsche/tree-sitter-ponylang/cc8a0ff12f4f9e56f8a0d997c55155b702938dfe";
+    url = "github:mfelsche/tree-sitter-ponylang";
+    rev = "cc8a0ff12f4f9e56f8a0d997c55155b702938dfe";
     hash = "sha256-/Qyr6TPmYPVQuWUmkb/77k94DK7nzlAA3hjSjeF6MeI=";
     meta = {
       license = lib.licenses.mit;
@@ -1863,7 +1979,8 @@
 
   powershell = {
     version = "0-unstable-2025-12-08";
-    url = "github:airbus-cert/tree-sitter-powershell/7212f47716ced384ac012b2cc428fd9f52f7c5d4";
+    url = "github:airbus-cert/tree-sitter-powershell";
+    rev = "7212f47716ced384ac012b2cc428fd9f52f7c5d4";
     hash = "sha256-xzDM1CdBY95XgLsEjqKWrwuIf/s6/2Q0XbxJRvOuL2o=";
     meta = {
       license = lib.licenses.mit;
@@ -1884,7 +2001,8 @@
 
   prolog = {
     version = "0-unstable-2025-03-23";
-    url = "codeberg:foxy/tree-sitter-prolog/d8d415f6a1cf80ca138524bcc395810b176d40fa";
+    url = "codeberg:foxy/tree-sitter-prolog";
+    rev = "d8d415f6a1cf80ca138524bcc395810b176d40fa";
     hash = "sha256-SEqqmkfV/wsr1ObcBN5My29RY9TWfxnQlsnEEIZyR18=";
     meta = {
       license = lib.licenses.mit;
@@ -1896,7 +2014,8 @@
 
   properties = {
     version = "0-unstable-2025-07-14";
-    url = "github:tree-sitter-grammars/tree-sitter-properties/6310671b24d4e04b803577b1c675d765cbd5773b";
+    url = "github:tree-sitter-grammars/tree-sitter-properties";
+    rev = "6310671b24d4e04b803577b1c675d765cbd5773b";
     hash = "sha256-LRutvpXXVK7z+xrnLQVvLY+VRg8IB/VK572PNgvsQfc=";
     meta = {
       license = lib.licenses.mit;
@@ -1908,7 +2027,8 @@
 
   proto = {
     version = "0-unstable-2021-06-12";
-    url = "github:mitchellh/tree-sitter-proto/42d82fa18f8afe59b5fc0b16c207ee4f84cb185f";
+    url = "github:mitchellh/tree-sitter-proto";
+    rev = "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f";
     hash = "sha256-cX+0YARIa9i8UymPPviyoj+Wh37AFYl9fsoNZMQXPgA=";
     meta = {
       license = lib.licenses.mit;
@@ -1917,7 +2037,8 @@
 
   prql = {
     version = "0-unstable-2023-07-28";
-    url = "github:PRQL/tree-sitter-prql/09e158cd3650581c0af4c49c2e5b10c4834c8646";
+    url = "github:PRQL/tree-sitter-prql";
+    rev = "09e158cd3650581c0af4c49c2e5b10c4834c8646";
     hash = "sha256-bdT7LZ2x7BdUqLJRq4ENJTaIFnciac7l2dCxOSB09CI=";
     meta = {
       license = lib.licenses.mit;
@@ -1929,7 +2050,8 @@
 
   pug = {
     version = "0-unstable-2024-11-17";
-    url = "github:zealot128/tree-sitter-pug/13e9195370172c86a8b88184cc358b23b677cc46";
+    url = "github:zealot128/tree-sitter-pug";
+    rev = "13e9195370172c86a8b88184cc358b23b677cc46";
     hash = "sha256-Yk1oBv9Flz+QX5tyFZwx0y67I5qgbnLhwYuAvLi9eV8=";
     meta = {
       license = lib.licenses.mit;
@@ -1938,7 +2060,8 @@
 
   purescript = {
     version = "0-unstable-2025-06-17";
-    url = "github:postsolar/tree-sitter-purescript/f541f95ffd6852fbbe88636317c613285bc105af";
+    url = "github:postsolar/tree-sitter-purescript";
+    rev = "f541f95ffd6852fbbe88636317c613285bc105af";
     hash = "sha256-tONS2Eai/eVDecn6ow4nN9F7++UjY6OAKezeCco8hYU=";
     meta = {
       license = lib.licenses.mit;
@@ -1996,7 +2119,8 @@
   quint = {
     version = "0-unstable-2025-04-09";
     url = "github:gruhn/tree-sitter-quint/release";
-    hash = "sha256-Eo9jvIhiRlMvNYSqQVS9/sIIkmIWpDJfenqObTWgy40=";
+    rev = "e413b1b57849a0097478548b25fcae2f3d0171d1";
+    hash = "sha256-WVSRFaj+X/S4DgyA6nWmRO+99iWG9Tr5hVrj53VB8E4=";
     meta = {
       license = lib.licenses.asl20;
       maintainers = with lib.maintainers; [
@@ -2016,7 +2140,8 @@
 
   razor = {
     version = "0-unstable-2025-02-17";
-    url = "github:tris203/tree-sitter-razor/fe46ce5ea7d844e53d59bc96f2175d33691c61c5";
+    url = "github:tris203/tree-sitter-razor";
+    rev = "fe46ce5ea7d844e53d59bc96f2175d33691c61c5";
     hash = "sha256-E4fgy588g6IP258TS2DvoILc1Aikvpfbtq20VIhBE4U=";
     meta = {
       license = lib.licenses.mit;
@@ -2049,7 +2174,8 @@
 
   rego = {
     version = "0-unstable-2024-06-12";
-    url = "github:FallenAngel97/tree-sitter-rego/20b5a5958c837bc9f74b231022a68a594a313f6d";
+    url = "github:FallenAngel97/tree-sitter-rego";
+    rev = "20b5a5958c837bc9f74b231022a68a594a313f6d";
     hash = "sha256-XwlVsOlxYzB0x+T05iuIp7nFAoQkMByKiHXZ0t5QsjI=";
     meta = {
       license = lib.licenses.mit;
@@ -2058,7 +2184,8 @@
 
   rescript = {
     version = "0-unstable-2025-03-03";
-    url = "github:rescript-lang/tree-sitter-rescript/d2df8a285fff95de56a91d2f8152aeceb66f40ef";
+    url = "github:rescript-lang/tree-sitter-rescript";
+    rev = "d2df8a285fff95de56a91d2f8152aeceb66f40ef";
     hash = "sha256-yNZrihl4BNvLu0Zqr4lSqvdZCeXU3KnCY7ZYC1U42R0=";
     meta = {
       license = lib.licenses.mit;
@@ -2070,7 +2197,8 @@
 
   river = {
     version = "0-unstable-2023-11-22";
-    url = "github:grafana/tree-sitter-river/eafcdc5147f985fea120feb670f1df7babb2f79e";
+    url = "github:grafana/tree-sitter-river";
+    rev = "eafcdc5147f985fea120feb670f1df7babb2f79e";
     hash = "sha256-fhuIO++hLr5DqqwgFXgg8QGmcheTpYaYLMo7117rjyk=";
     meta = {
       license = lib.licenses.asl20;
@@ -2079,7 +2207,8 @@
 
   robot = {
     version = "0-unstable-2025-05-01";
-    url = "github:Hubro/tree-sitter-robot/e34def7cb0d8a66a59ec5057fe17bb4e6b17b56a";
+    url = "github:Hubro/tree-sitter-robot";
+    rev = "e34def7cb0d8a66a59ec5057fe17bb4e6b17b56a";
     hash = "sha256-fTV45TQp2Z+ivh2YWphlJjyuBh0iMCpaNDyKoHrNAh0=";
     meta = {
       license = lib.licenses.isc;
@@ -2091,7 +2220,8 @@
 
   ron = {
     version = "0-unstable-2024-05-05";
-    url = "github:tree-sitter-grammars/tree-sitter-ron/78938553b93075e638035f624973083451b29055";
+    url = "github:tree-sitter-grammars/tree-sitter-ron";
+    rev = "78938553b93075e638035f624973083451b29055";
     hash = "sha256-Sp0g6AWKHNjyUmL5k3RIU+5KtfICfg3o/DH77XRRyI0=";
     meta = {
       license = lib.licenses.asl20;
@@ -2130,7 +2260,8 @@
 
   rust-format-args = {
     version = "0-unstable-2025-07-14";
-    url = "github:nik-rev/tree-sitter-rust-format-args/3cf8431a4951656bcf24ae06689fbd094fce0187";
+    url = "github:nik-rev/tree-sitter-rust-format-args";
+    rev = "3cf8431a4951656bcf24ae06689fbd094fce0187";
     hash = "sha256-lt4vs14DZXCxlpG7awmrZ5Ml5Sr0kKEn5Y26xrlM/ww=";
     meta = {
       license = lib.licenses.mit;
@@ -2151,7 +2282,8 @@
 
   scheme = {
     version = "0.24.7-1-unstable-2025-12-13";
-    url = "github:6cdh/tree-sitter-scheme/b5c701148501fa056302827442b5b4956f1edc03";
+    url = "github:6cdh/tree-sitter-scheme";
+    rev = "b5c701148501fa056302827442b5b4956f1edc03";
     hash = "sha256-SLuK8S03pKVVhxJTkE3ZJvNaNnmXD323YwE7ah2VxyQ=";
     meta = {
       license = lib.licenses.mit;
@@ -2169,7 +2301,8 @@
 
   slang = {
     version = "0-unstable-2025-09-01";
-    url = "github:tree-sitter-grammars/tree-sitter-slang/1dbcc4abc7b3cdd663eb03d93031167d6ed19f56";
+    url = "github:tree-sitter-grammars/tree-sitter-slang";
+    rev = "1dbcc4abc7b3cdd663eb03d93031167d6ed19f56";
     hash = "sha256-UsZpXEJwbKn5M9dqbAv5eJgsCdNbsllbFWtNnDPvtoE=";
     meta = {
       license = lib.licenses.mit;
@@ -2181,7 +2314,8 @@
 
   slint = {
     version = "0-unstable-2025-12-09";
-    url = "github:slint-ui/tree-sitter-slint/10fb0f188d7950400773c06ba6c31075866e14bf";
+    url = "github:slint-ui/tree-sitter-slint";
+    rev = "10fb0f188d7950400773c06ba6c31075866e14bf";
     hash = "sha256-60DfIx7aQqe0/ocxbpr00eU3IPs23E8TUILcVGrBYVs=";
     meta = {
       license = lib.licenses.mit;
@@ -2190,7 +2324,8 @@
 
   smali = {
     version = "0-unstable-2024-05-05";
-    url = "github:amaanq/tree-sitter-smali/fdfa6a1febc43c7467aa7e937b87b607956f2346";
+    url = "github:amaanq/tree-sitter-smali";
+    rev = "fdfa6a1febc43c7467aa7e937b87b607956f2346";
     hash = "sha256-S0U6Xuntz16DrpYwSqMQu8Cu7UuD/JufHUxIHv826yw=";
     meta = {
       license = lib.licenses.mit;
@@ -2220,7 +2355,8 @@
 
   snakemake = {
     version = "0-unstable-2025-09-18";
-    url = "github:osthomas/tree-sitter-snakemake/68010430c3e51c0e84c1ce21c6551df0e2469f51";
+    url = "github:osthomas/tree-sitter-snakemake";
+    rev = "68010430c3e51c0e84c1ce21c6551df0e2469f51";
     hash = "sha256-jcMNh+pHjYEvTdShp3o6UlgXRM2AuZMp4KE0uXfNMqY=";
     meta = {
       license = lib.licenses.mit;
@@ -2241,7 +2377,8 @@
 
   sourcepawn = {
     version = "0-unstable-2025-06-13";
-    url = "github:nilshelmig/tree-sitter-sourcepawn/5a8fdd446b516c81e218245c12129c6ad4bccfa2";
+    url = "github:nilshelmig/tree-sitter-sourcepawn";
+    rev = "5a8fdd446b516c81e218245c12129c6ad4bccfa2";
     hash = "sha256-TfLCG2Ro3QnGStyCNqHwO54HQMR2fEOV6FjBv+0LjJ0=";
     meta = {
       license = lib.licenses.mit;
@@ -2253,7 +2390,8 @@
 
   spade = {
     version = "0-unstable-2025-12-08";
-    url = "gitlab:spade-lang/tree-sitter-spade/6569cd11cc9362e277845ce24111735059b145ee";
+    url = "gitlab:spade-lang/tree-sitter-spade";
+    rev = "6569cd11cc9362e277845ce24111735059b145ee";
     hash = "sha256-h7rlrtV1NHjFPITR1cvYCblkUmbUudem4Ll6Z7qBFqE=";
     meta = {
       license = lib.licenses.mit;
@@ -2265,7 +2403,8 @@
 
   sparql = {
     version = "0.1.0-unstable-2025-10-15";
-    url = "github:GordianDziwis/tree-sitter-sparql/1ef52d35a73a2a5f2e433ecfd1c751c1360a923b";
+    url = "github:GordianDziwis/tree-sitter-sparql";
+    rev = "1ef52d35a73a2a5f2e433ecfd1c751c1360a923b";
     hash = "sha256-9DaV12dkcwF7/jWc4QaTQaHcKu5zO5evWlXGNZMdRqc=";
     meta = {
       license = lib.licenses.mit;
@@ -2274,7 +2413,8 @@
 
   spicedb = {
     version = "0-unstable-2024-02-08";
-    url = "github:jzelinskie/tree-sitter-spicedb/a4e4645651f86d6684c15dfa9931b7841dc52a66";
+    url = "github:jzelinskie/tree-sitter-spicedb";
+    rev = "a4e4645651f86d6684c15dfa9931b7841dc52a66";
     hash = "sha256-dEpPkEohBB3qU1Vma/1VePkGGst4nA2RKgun7NiO2OA=";
     meta = {
       license = lib.licenses.mit;
@@ -2294,10 +2434,10 @@
     };
   };
 
-  sshclientconfig = {
-    version = "0-unstable-2025-12-19";
-    url = "github:metio/tree-sitter-ssh-client-config/9c86b2af6d8f9fd0a82edcc253b45c3e8eb93c52";
-    hash = "sha256-YF+iMd0F1po0j8FqBO36P6DCpMgscT6YkVMOKetAS6w=";
+  sshclientconfig = rec {
+    version = "2026.2.18";
+    url = "github:metio/tree-sitter-ssh-client-config?ref=${version}";
+    hash = "sha256-zEQ9jof8CMx6YtzU+y/GnBeI7htv9EbUHtAKSmX6c3M=";
     meta = {
       license = lib.licenses.cc0;
       maintainers = with lib.maintainers; [
@@ -2308,7 +2448,8 @@
 
   strace = {
     version = "0-unstable-2025-12-21";
-    url = "github:sigmaSd/tree-sitter-strace/ac874ddfcc08d689fee1f4533789e06d88388f29";
+    url = "github:sigmaSd/tree-sitter-strace";
+    rev = "ac874ddfcc08d689fee1f4533789e06d88388f29";
     hash = "sha256-BGCbpw85+NNQMF+emS2hllbIeTmiFvveFzlK5lKaD5U=";
     meta = {
       license = lib.licenses.mit;
@@ -2347,7 +2488,8 @@
 
   sway = {
     version = "0-unstable-2025-09-02";
-    url = "github:FuelLabs/tree-sitter-sway/9b7845ce06ecb38b040c3940970b4fd0adc331d1";
+    url = "github:FuelLabs/tree-sitter-sway";
+    rev = "9b7845ce06ecb38b040c3940970b4fd0adc331d1";
     hash = "sha256-+BRw4OFQb7FljdKCj5mruK0L9wsZ+1UDTykVLS9wjoY=";
     meta = {
       license = lib.licenses.asl20;
@@ -2371,7 +2513,8 @@
 
   t32 = {
     version = "0-unstable-2025-12-19";
-    url = "github:xasc/tree-sitter-t32/5b5e4336731bda5ea2e6b78b6a2d9e7a89032b75";
+    url = "github:xasc/tree-sitter-t32";
+    rev = "5b5e4336731bda5ea2e6b78b6a2d9e7a89032b75";
     hash = "sha256-dAbjM+wlKtJ3cY3zdRgsdsjJ0ZYDZxTL0mcunqqNbvw=";
     meta = {
       maintainers = with lib.maintainers; [
@@ -2382,7 +2525,8 @@
 
   tablegen = {
     version = "0-unstable-2024-10-04";
-    url = "github:Flakebi/tree-sitter-tablegen/3e9c4822ab5cdcccf4f8aa9dcd42117f736d51d9";
+    url = "github:Flakebi/tree-sitter-tablegen";
+    rev = "3e9c4822ab5cdcccf4f8aa9dcd42117f736d51d9";
     hash = "sha256-8yn/Czv/aNQfa/k8gnr8qeCsuDtU2L2qHGKAMbv8Vgk=";
     meta = {
       license = lib.licenses.mit;
@@ -2394,7 +2538,8 @@
 
   tact = {
     version = "0-unstable-2025-05-01";
-    url = "github:tact-lang/tree-sitter-tact/a6267c2091ed432c248780cec9f8d42c8766d9ad";
+    url = "github:tact-lang/tree-sitter-tact";
+    rev = "a6267c2091ed432c248780cec9f8d42c8766d9ad";
     hash = "sha256-2AUN/VYor3K0hkneLYa6+LjE+V8EJogFqBTgdfvOiKM=";
     meta = {
       license = lib.licenses.mit;
@@ -2415,7 +2560,8 @@
 
   task = {
     version = "0-unstable-2022-08-17";
-    url = "github:alexanderbrevig/tree-sitter-task/ed4fb3674dd2d889c36e121f7173099290452af2";
+    url = "github:alexanderbrevig/tree-sitter-task";
+    rev = "ed4fb3674dd2d889c36e121f7173099290452af2";
     hash = "sha256-0vqXoDgQcAE1rm3kFlb+l/S4cZuL5sU3WsZMDSna1+s=";
     meta = {
       license = lib.licenses.mit;
@@ -2427,7 +2573,8 @@
 
   tcl = {
     version = "0-unstable-2025-05-14";
-    url = "github:tree-sitter-grammars/tree-sitter-tcl/8f11ac7206a54ed11210491cee1e0657e2962c47";
+    url = "github:tree-sitter-grammars/tree-sitter-tcl";
+    rev = "8f11ac7206a54ed11210491cee1e0657e2962c47";
     hash = "sha256-JrGSHGolf7OhInxotXslw1QXxJscl+bXCxZPYJeBfTY=";
     meta = {
       license = lib.licenses.mit;
@@ -2439,7 +2586,8 @@
 
   teal = {
     version = "0-unstable-2025-05-14";
-    url = "github:euclidianAce/tree-sitter-teal/05d276e737055e6f77a21335b7573c9d3c091e2f";
+    url = "github:euclidianAce/tree-sitter-teal";
+    rev = "05d276e737055e6f77a21335b7573c9d3c091e2f";
     hash = "sha256-JDqWr895Ob1Jn3Kf44xbkMJqyna0AiMBU5xJpA6ZP7w=";
     meta = {
       license = lib.licenses.mit;
@@ -2451,7 +2599,8 @@
 
   templ = {
     version = "1.0.0-unstable-2025-12-03";
-    url = "github:vrischmann/tree-sitter-templ/3057cd485f7f23a8ad24107c6adc604f8c5ce3db";
+    url = "github:vrischmann/tree-sitter-templ";
+    rev = "3057cd485f7f23a8ad24107c6adc604f8c5ce3db";
     hash = "sha256-iv5Egh0CcBEsD86IGESI5Bn0NcGji3wruD8UR1JNlk0=";
     meta = {
       license = lib.licenses.mit;
@@ -2469,7 +2618,8 @@
 
   textproto = {
     version = "0-unstable-2024-10-16";
-    url = "github:PorterAtGoogle/tree-sitter-textproto/568471b80fd8793d37ed01865d8c2208a9fefd1b";
+    url = "github:PorterAtGoogle/tree-sitter-textproto";
+    rev = "568471b80fd8793d37ed01865d8c2208a9fefd1b";
     hash = "sha256-VAj8qSxbkFqNp0X8BOZNvGTggSXZvzDjODedY11J0BQ=";
     meta = {
       license = lib.licenses.isc;
@@ -2481,7 +2631,8 @@
 
   thrift = {
     version = "0-unstable-2024-04-20";
-    url = "github:tree-sitter-grammars/tree-sitter-thrift/68fd0d80943a828d9e6f49c58a74be1e9ca142cf";
+    url = "github:tree-sitter-grammars/tree-sitter-thrift";
+    rev = "68fd0d80943a828d9e6f49c58a74be1e9ca142cf";
     hash = "sha256-owZbs8ttjKrqTA8fQ/NmBGyIUUItSUvvW4hRv0NPV8Y=";
     meta = {
       license = lib.licenses.mit;
@@ -2493,7 +2644,8 @@
 
   tiger = {
     version = "0.3.0-unstable-2025-03-13";
-    url = "github:ambroisie/tree-sitter-tiger/4a77b2d7a004587646bddc4e854779044b6db459";
+    url = "github:ambroisie/tree-sitter-tiger";
+    rev = "4a77b2d7a004587646bddc4e854779044b6db459";
     hash = "sha256-jLdJ3nLShoBxVCcUbnaswYG5d4UU8aaE1xexb2LnmTQ=";
     meta = {
       license = lib.licenses.mit;
@@ -2513,7 +2665,8 @@
 
   todotxt = {
     version = "0-unstable-2024-01-15";
-    url = "github:arnarg/tree-sitter-todotxt/3937c5cd105ec4127448651a21aef45f52d19609";
+    url = "github:arnarg/tree-sitter-todotxt";
+    rev = "3937c5cd105ec4127448651a21aef45f52d19609";
     hash = "sha256-OeAh51rcFTiexAraRzIZUR/A8h9RPwKY7rmtc3ZzoRQ=";
     meta = {
       license = lib.licenses.mit;
@@ -2522,7 +2675,8 @@
 
   toml = {
     version = "0.5.1-unstable-2022-04-21";
-    url = "github:tree-sitter/tree-sitter-toml/342d9be207c2dba869b9967124c679b5e6fd0ebe";
+    url = "github:tree-sitter/tree-sitter-toml";
+    rev = "342d9be207c2dba869b9967124c679b5e6fd0ebe";
     hash = "sha256-V2c7K16g8PikE9eNgrM6iUDiu4kzBvHMFQwfkph+8QI=";
     meta = {
       license = lib.licenses.mit;
@@ -2531,7 +2685,8 @@
 
   tsq = {
     version = "0.19.0-unstable-2024-02-24";
-    url = "github:tree-sitter/tree-sitter-tsq/49da6de661be6a07cb51018880ebe680324e7b82";
+    url = "github:tree-sitter/tree-sitter-tsq";
+    rev = "49da6de661be6a07cb51018880ebe680324e7b82";
     hash = "sha256-md4xynJx9F/l6N+JZYU8CLXmz50fV13L8xGJVUqk6do=";
     meta = {
       license = lib.licenses.mit;
@@ -2549,7 +2704,8 @@
 
   turtle = {
     version = "0.1.0-unstable-2024-07-02";
-    url = "github:GordianDziwis/tree-sitter-turtle/7f789ea7ef765080f71a298fc96b7c957fa24422";
+    url = "github:GordianDziwis/tree-sitter-turtle";
+    rev = "7f789ea7ef765080f71a298fc96b7c957fa24422";
     hash = "sha256-z6f73euFAG9du5owz7V9WLbWK81Jg0DwxN1metKPbTA=";
     meta = {
       license = lib.licenses.mit;
@@ -2576,7 +2732,8 @@
 
   typespec = {
     version = "0-unstable-2025-06-21";
-    url = "github:happenslol/tree-sitter-typespec/814c98283fd92a248ba9d49ebfe61bc672a35875";
+    url = "github:happenslol/tree-sitter-typespec";
+    rev = "814c98283fd92a248ba9d49ebfe61bc672a35875";
     hash = "sha256-3/zNoawx1DsKmG0KFvJD+o80IMBsJd2VV2ng+fSrV1c=";
     meta = {
       license = lib.licenses.mit;
@@ -2606,7 +2763,8 @@
 
   ungrammar = {
     version = "0-unstable-2023-02-28";
-    url = "github:Philipp-M/tree-sitter-ungrammar/debd26fed283d80456ebafa33a06957b0c52e451";
+    url = "github:Philipp-M/tree-sitter-ungrammar";
+    rev = "debd26fed283d80456ebafa33a06957b0c52e451";
     hash = "sha256-ftvcD8I+hYqH3EGxaRZ0w8FHjBA34OSTTsrUsAOtayU=";
     meta = {
       license = lib.licenses.mit;
@@ -2618,7 +2776,8 @@
 
   unison = {
     version = "0-unstable-2025-03-06";
-    url = "github:kylegoetz/tree-sitter-unison/169e7f748a540ec360c0cb086b448faad012caa4";
+    url = "github:kylegoetz/tree-sitter-unison";
+    rev = "169e7f748a540ec360c0cb086b448faad012caa4";
     hash = "sha256-0HOLtLh1zRdaGQqchT5zFegWKJHkQe9r7DGKL6sSkPo=";
     meta = {
       license = lib.licenses.mit;
@@ -2630,7 +2789,8 @@
 
   uxntal = {
     version = "0-unstable-2024-03-23";
-    url = "github:Jummit/tree-sitter-uxntal/1a44f8d31053096b79c52f10a39da12479edbf64";
+    url = "github:Jummit/tree-sitter-uxntal";
+    rev = "1a44f8d31053096b79c52f10a39da12479edbf64";
     hash = "sha256-S6B2K2eqHktLknpfTATR5fZYE8+W1BvOYTSNTwslSVg=";
     meta = {
       license = lib.licenses.mit;
@@ -2655,7 +2815,8 @@
 
   vala = {
     version = "0-unstable-2024-10-29";
-    url = "github:vala-lang/tree-sitter-vala/97e6db3c8c73b15a9541a458d8e797a07f588ef4";
+    url = "github:vala-lang/tree-sitter-vala";
+    rev = "97e6db3c8c73b15a9541a458d8e797a07f588ef4";
     hash = "sha256-hAekweZGDHVrWVd04RrN+9Jz0D2kode+DpceTlUXii0=";
     meta = {
       license = lib.licenses.lgpl21Only;
@@ -2667,7 +2828,8 @@
 
   vento = {
     version = "0-unstable-2024-12-30";
-    url = "github:ventojs/tree-sitter-vento/3b32474bc29584ea214e4e84b47102408263fe0e";
+    url = "github:ventojs/tree-sitter-vento";
+    rev = "3b32474bc29584ea214e4e84b47102408263fe0e";
     hash = "sha256-h8yC+MJIAH7DM69UQ8moJBmcmrSZkxvWrMb+NqtYB2Y=";
     meta = {
       license = lib.licenses.mit;
@@ -2688,7 +2850,8 @@
 
   vhdl = {
     version = "0-unstable-2025-12-18";
-    url = "github:jpt13653903/tree-sitter-vhdl/7ae08deb5d1641aa57111342218ca1e1b3a5d539";
+    url = "github:jpt13653903/tree-sitter-vhdl";
+    rev = "7ae08deb5d1641aa57111342218ca1e1b3a5d539";
     hash = "sha256-IJ6Gqq+3YJlL4n4cjtCLUCZKpLVJQa81nQrLsJBCccs=";
     meta = {
       license = lib.licenses.mit;
@@ -2700,7 +2863,8 @@
 
   vhs = {
     version = "0-unstable-2025-03-26";
-    url = "github:charmbracelet/tree-sitter-vhs/0c6fae9d2cfc5b217bfd1fe84a7678f5917116db";
+    url = "github:charmbracelet/tree-sitter-vhs";
+    rev = "0c6fae9d2cfc5b217bfd1fe84a7678f5917116db";
     hash = "sha256-o7Q/3wwiCjxO6hBfj1Wxoz2y6+wxLH+oCLiapox7+Hk=";
     meta = {
       license = lib.licenses.mit;
@@ -2712,7 +2876,8 @@
 
   vim = {
     version = "0.2.0-unstable-2023-05-05";
-    url = "github:vigoux/tree-sitter-viml/7c317fbade4b40baa7babcd6c9097c157d148e60";
+    url = "github:vigoux/tree-sitter-viml";
+    rev = "7c317fbade4b40baa7babcd6c9097c157d148e60";
     hash = "sha256-/TyPUBsKRcF9Ig8psqd4so2IMbHtTu4weJXgfd96Vrs=";
     meta = {
       license = lib.licenses.mit;
@@ -2721,7 +2886,8 @@
 
   vue = {
     version = "0.2.1-unstable-2021-04-04";
-    url = "github:ikatyang/tree-sitter-vue/91fe2754796cd8fba5f229505a23fa08f3546c06";
+    url = "github:ikatyang/tree-sitter-vue";
+    rev = "91fe2754796cd8fba5f229505a23fa08f3546c06";
     hash = "sha256-NeuNpMsKZUP5mrLCjJEOSLD6tlJpNO4Z/rFUqZLHE1A=";
     meta = {
       license = lib.licenses.mit;
@@ -2730,7 +2896,8 @@
 
   wast = {
     version = "0-unstable-2022-05-17";
-    url = "github:wasm-lsp/tree-sitter-wasm/2ca28a9f9d709847bf7a3de0942a84e912f59088";
+    url = "github:wasm-lsp/tree-sitter-wasm";
+    rev = "2ca28a9f9d709847bf7a3de0942a84e912f59088";
     hash = "sha256-a1l4RsGpRQfUxEjwewyKiV0G7J2DHZW6+y1HnjREYAs=";
     location = "wast";
     meta = {
@@ -2746,7 +2913,8 @@
 
   wat = {
     version = "0-unstable-2022-05-17";
-    url = "github:wasm-lsp/tree-sitter-wasm/2ca28a9f9d709847bf7a3de0942a84e912f59088";
+    url = "github:wasm-lsp/tree-sitter-wasm";
+    rev = "2ca28a9f9d709847bf7a3de0942a84e912f59088";
     hash = "sha256-a1l4RsGpRQfUxEjwewyKiV0G7J2DHZW6+y1HnjREYAs=";
     location = "wat";
     meta = {
@@ -2762,7 +2930,8 @@
 
   werk = {
     version = "0-unstable-2025-03-19";
-    url = "github:little-bonsai/tree-sitter-werk/92b0f7fe98465c4c435794a58e961306193d1c1e";
+    url = "github:little-bonsai/tree-sitter-werk";
+    rev = "92b0f7fe98465c4c435794a58e961306193d1c1e";
     hash = "sha256-VPY1fMYGSF1+87ia+d7b7l8PzNIoKwAbAT+yw5KHjjQ=";
     meta = {
       license = lib.licenses.mit;
@@ -2774,7 +2943,8 @@
 
   wesl = {
     version = "0-unstable-2025-09-26";
-    url = "github:wgsl-tooling-wg/tree-sitter-wesl/3fa2b96bf5c217dae9bf663e2051fcdad0762c19";
+    url = "github:wgsl-tooling-wg/tree-sitter-wesl";
+    rev = "3fa2b96bf5c217dae9bf663e2051fcdad0762c19";
     hash = "sha256-O3n65StgGhxfdwYF/QPBTdkXEGjY2ajHeLpF5JWuTc8=";
     meta = {
       license = lib.licenses.mit;
@@ -2786,7 +2956,8 @@
 
   wgsl = {
     version = "0-unstable-2023-01-09";
-    url = "github:szebniok/tree-sitter-wgsl/40259f3c77ea856841a4e0c4c807705f3e4a2b65";
+    url = "github:szebniok/tree-sitter-wgsl";
+    rev = "40259f3c77ea856841a4e0c4c807705f3e4a2b65";
     hash = "sha256-voLkcJ/062hzipb3Ak/mgQvFbrLUJdnXq1IupzjMJXA=";
     meta = {
       license = lib.licenses.mit;
@@ -2804,7 +2975,8 @@
 
   wit = {
     version = "0-unstable-2022-10-31";
-    url = "github:hh9527/tree-sitter-wit/c917790ab9aec50c5fd664cbfad8dd45110cfff3";
+    url = "github:hh9527/tree-sitter-wit";
+    rev = "c917790ab9aec50c5fd664cbfad8dd45110cfff3";
     hash = "sha256-5+cw9vWPizK7YlEhiNJheYVYOgtheEifd4g1KF5ldyE=";
     meta = {
       license = lib.licenses.mit;
@@ -2816,7 +2988,8 @@
 
   wren = {
     version = "0-unstable-2024-01-01";
-    url = "sourcehut:~jummit/tree-sitter-wren/6748694be32f11e7ec6b5faeb1b48ca6156d4e06";
+    url = "sourcehut:~jummit/tree-sitter-wren";
+    rev = "6748694be32f11e7ec6b5faeb1b48ca6156d4e06";
     hash = "sha256-CU08QY4X/u4W4AEkK+gUmy5P8/XoBHDJmWX1vdGjmsI=";
     meta = {
       license = lib.licenses.lgpl3;
@@ -2828,7 +3001,8 @@
 
   xit = {
     version = "0-unstable-2024-03-16";
-    url = "github:synaptiko/tree-sitter-xit/a4fad351bfa5efdcb379b40c36671413fbe9caac";
+    url = "github:synaptiko/tree-sitter-xit";
+    rev = "a4fad351bfa5efdcb379b40c36671413fbe9caac";
     hash = "sha256-wTr7YyGnz/dWfA5oecRqxeR8Unoob6isGnQg4/iu+MI=";
     meta = {
       license = lib.licenses.mit;
@@ -2840,7 +3014,8 @@
 
   xml = {
     version = "0-unstable-2023-01-17";
-    url = "github:RenjiSann/tree-sitter-xml/48a7c2b6fb9d515577e115e6788937e837815651";
+    url = "github:RenjiSann/tree-sitter-xml";
+    rev = "48a7c2b6fb9d515577e115e6788937e837815651";
     hash = "sha256-8c/XtnffylxiqX3Q7VFWlrk/655FG2pwqYrftGpnVxI=";
     meta = {
       license = lib.licenses.mit;
@@ -2852,7 +3027,8 @@
 
   xtc = {
     version = "0-unstable-2024-04-15";
-    url = "github:Alexis-Lapierre/tree-sitter-xtc/7bc11b736250c45e25cfb0215db2f8393779957e";
+    url = "github:Alexis-Lapierre/tree-sitter-xtc";
+    rev = "7bc11b736250c45e25cfb0215db2f8393779957e";
     hash = "sha256-teUDDvH8Km1WHNXyrUtX1yULYOaTgaAwT6aCaR4MTfs=";
     meta = {
       license = lib.licenses.mit;
@@ -2873,7 +3049,8 @@
 
   yang = {
     version = "0-unstable-2022-11-21";
-    url = "github:hubro/tree-sitter-yang/2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502";
+    url = "github:hubro/tree-sitter-yang";
+    rev = "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502";
     hash = "sha256-6EIK1EStHrUHBLZBsZqd1LL05ZAJ6PKUyIzBBsTVjO8=";
     meta = {
       license = lib.licenses.asl20;
@@ -2882,7 +3059,8 @@
 
   yara = {
     version = "0-unstable-2024-12-12";
-    url = "github:egibs/tree-sitter-yara/eb3ede203275c38000177f72ec0f9965312806ef";
+    url = "github:egibs/tree-sitter-yara";
+    rev = "eb3ede203275c38000177f72ec0f9965312806ef";
     hash = "sha256-twcbL2fKOE0PdiEboSIObzAedljZ3arBm6QQUw/W5HQ=";
     meta = {
       license = lib.licenses.asl20;
@@ -2894,7 +3072,8 @@
 
   yuck = {
     version = "0-unstable-2024-05-05";
-    url = "github:Philipp-M/tree-sitter-yuck/e877f6ade4b77d5ef8787075141053631ba12318";
+    url = "github:Philipp-M/tree-sitter-yuck";
+    rev = "e877f6ade4b77d5ef8787075141053631ba12318";
     hash = "sha256-l8c1/7q8S78jGyl+VAVVgs8wq58PrrjycyJfWXsCgAI=";
     meta = {
       license = lib.licenses.mit;
@@ -2906,7 +3085,8 @@
 
   zig = {
     version = "0-unstable-2024-10-13";
-    url = "github:maxxnino/tree-sitter-zig/a80a6e9be81b33b182ce6305ae4ea28e29211bd5";
+    url = "github:maxxnino/tree-sitter-zig";
+    rev = "a80a6e9be81b33b182ce6305ae4ea28e29211bd5";
     hash = "sha256-o3RAbW8kLSfKxuQ/z7WDb5BaDVxZUG5oFutovRkErjk=";
     meta = {
       license = lib.licenses.mit;
diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index 7c108f91c9e3..161d304739e6 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -15,8 +15,8 @@ let
       hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
     };
     "10" = {
-      version = "10.28.0";
-      hash = "sha256-mwsE5ueZRVZpF/hBG7b2X9Lz4VkEJpBOhQDhrMSzNWE=";
+      version = "10.30.0";
+      hash = "sha256-/ePOu9TtDW0UCxmDdDv1dc3UsV5NXlsldCUVLc5bG2o=";
     };
   };
 
diff --git a/pkgs/development/web/nodejs/v25.nix b/pkgs/development/web/nodejs/v25.nix
index 978896fe35cc..28609675644c 100644
--- a/pkgs/development/web/nodejs/v25.nix
+++ b/pkgs/development/web/nodejs/v25.nix
@@ -23,7 +23,6 @@ let
       [ ];
 in
 buildNodejs {
-
   version = "25.6.1";
   sha256 = "cf756781c8b4dc5ee030f87ddf9d51b8d5bf219ad56cbd9855c4a3bdc832c78e";
   patches =
diff --git a/pkgs/kde/plasma/plasma-login-manager/default.nix b/pkgs/kde/plasma/plasma-login-manager/default.nix
index 13799afaf4b4..964c988368fd 100644
--- a/pkgs/kde/plasma/plasma-login-manager/default.nix
+++ b/pkgs/kde/plasma/plasma-login-manager/default.nix
@@ -32,4 +32,8 @@ mkKdeDerivation {
     "-DUID_MAX=29999"
     "-DINSTALL_PAM_CONFIGURATION=OFF"
   ];
+
+  postInstall = ''
+    install -Dm444 ${./defaults.conf} $out/lib/plasmalogin/defaults.conf
+  '';
 }
diff --git a/pkgs/kde/plasma/plasma-login-manager/defaults.conf b/pkgs/kde/plasma/plasma-login-manager/defaults.conf
new file mode 100644
index 000000000000..1a7b6a98df6c
--- /dev/null
+++ b/pkgs/kde/plasma/plasma-login-manager/defaults.conf
@@ -0,0 +1,2 @@
+[Greeter]
+PreselectedSession=plasma.desktop
diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix
deleted file mode 100644
index 2e81140eb681..000000000000
--- a/pkgs/misc/lilypond/unstable.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  fetchzip,
-  lilypond,
-}:
-
-lilypond.overrideAttrs (oldAttrs: rec {
-  version = "2.25.32";
-  src = fetchzip {
-    url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
-    hash = "sha256-j7Avb9WSy27yQCak3KV7OB24M+T76b/tLcLoINLSEbo=";
-  };
-
-  passthru.updateScript = {
-    command = [
-      ./update.sh
-      "unstable"
-    ];
-    supportedFeatures = [ "commit" ];
-  };
-})
diff --git a/pkgs/misc/lilypond/update.sh b/pkgs/misc/lilypond/update.sh
deleted file mode 100755
index 5d5f855dbd7c..000000000000
--- a/pkgs/misc/lilypond/update.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl gnused nix
-
-set -euo pipefail
-
-if [ $# -gt 0 ] && [ "$1" = "unstable" ]; then
-    ATTR="lilypond-unstable"
-    FILE="$(dirname "${BASH_SOURCE[@]}")/unstable.nix"
-    QUERY="VERSION_DEVEL="
-else
-    ATTR="lilypond"
-    FILE="$(dirname "${BASH_SOURCE[@]}")/default.nix"
-    QUERY="VERSION_STABLE="
-fi
-
-# update version
-PREV=$(nix eval --raw -f default.nix $ATTR.version)
-NEXT=$(curl -s 'https://gitlab.com/lilypond/lilypond/-/raw/master/VERSION' | grep "$QUERY" | cut -d= -f2)
-sed -i "s|$PREV|$NEXT|" "$FILE"
-echo "[{\"commitMessage\":\"$ATTR: $PREV -> $NEXT\"}]"
-
-# update hash
-PREV=$(nix eval --raw -f default.nix $ATTR.src.outputHash)
-NEXT=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 --unpack $(nix eval --raw -f default.nix $ATTR.src.url)))
-sed -i "s|$PREV|$NEXT|" "$FILE"
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
index e4b10e79d42d..8d90b7178635 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
@@ -2,7 +2,7 @@
   lib,
   stdenvNoCC,
   fetchurl,
-  b43FirmwareCutter,
+  b43-fwcutter,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "b43-firmware";
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     hash = "sha256-8ecGeqxbYrZ7i25MUXmQJ3gEM5rBYGXrE8cx/5Ca5G8=";
   };
 
-  nativeBuildInputs = [ b43FirmwareCutter ];
+  nativeBuildInputs = [ b43-fwcutter ];
 
   installPhase = ''
     mkdir -p $out/lib/firmware
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
index 34b3e8cf2775..a82d2de3d9c9 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
@@ -2,7 +2,7 @@
   lib,
   stdenvNoCC,
   fetchurl,
-  b43FirmwareCutter,
+  b43-fwcutter,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "b43-firmware";
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     hash = "sha256-oHw7ayd4M8fb5h2qUR+QjNZsXidj63oIWavDbNkzXC0=";
   };
 
-  nativeBuildInputs = [ b43FirmwareCutter ];
+  nativeBuildInputs = [ b43-fwcutter ];
 
   sourceRoot = ".";
 
diff --git a/pkgs/os-specific/linux/hid-fanatecff/default.nix b/pkgs/os-specific/linux/hid-fanatecff/default.nix
index 9ccdb93cc322..2d2dd64c622e 100644
--- a/pkgs/os-specific/linux/hid-fanatecff/default.nix
+++ b/pkgs/os-specific/linux/hid-fanatecff/default.nix
@@ -52,5 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ rake5k ];
     platforms = lib.platforms.linux;
     mainProgram = "hid-fanatecff";
+    broken = lib.versionOlder kernel.version "6.1";
   };
 })
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 5d45d4526774..0a93af952b4d 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -565,10 +565,6 @@ let
         # Enable CEC over DisplayPort
         DRM_DP_CEC = whenOlder "6.10" yes;
         DRM_DISPLAY_DP_AUX_CEC = whenAtLeast "6.10" yes;
-
-        # Do not enable Nova drivers, which are still WIP. This is the Kconfig default.
-        NOVA_CORE = whenAtLeast "6.15" no;
-        DRM_NOVA = whenAtLeast "6.16" no;
       }
       //
         lib.optionalAttrs
@@ -606,6 +602,10 @@ let
       DRM_PANIC_SCREEN = whenAtLeast "6.12" (freeform "kmsg");
 
       DRM_PANIC_SCREEN_QR_CODE = whenAtLeast "6.12" yes;
+
+      # Do not enable Nova drivers, which are still WIP. This is the Kconfig default.
+      NOVA_CORE = whenAtLeast "6.15" no;
+      DRM_NOVA = whenAtLeast "6.16" no;
     };
 
     sound = {
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index b01bd9b1b5ce..1c60213097a1 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -72,12 +72,12 @@ rec {
   stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else production;
 
   production = generic {
-    version = "580.126.09";
-    sha256_64bit = "sha256-TKxT5I+K3/Zh1HyHiO0kBZokjJ/YCYzq/QiKSYmG7CY=";
-    sha256_aarch64 = "sha256-c5PEKxEv1vCkmOHSozEnuCG+WLdXDcn41ViaUWiNpK0=";
-    openSha256 = "sha256-ychsaurbQ2KNFr/SAprKI2tlvAigoKoFU1H7+SaxSrY=";
-    settingsSha256 = "sha256-4SfCWp3swUp+x+4cuIZ7SA5H7/NoizqgPJ6S9fm90fA=";
-    persistencedSha256 = "sha256-J1UwS0o/fxz45gIbH9uaKxARW+x4uOU1scvAO4rHU5Y=";
+    version = "580.126.18";
+    sha256_64bit = "sha256-p3gbLhwtZcZYCRTHbnntRU0ClF34RxHAMwcKCSqatJ0=";
+    sha256_aarch64 = "sha256-pruxWQlLurymRL7PbR24NA6dNowwwX35p6j9mBIDcNs=";
+    openSha256 = "sha256-1Q2wuDdZ6KiA/2L3IDN4WXF8t63V/4+JfrFeADI1Cjg=";
+    settingsSha256 = "sha256-QMx4rUPEGp/8Mc+Bd8UmIet/Qr0GY8bnT/oDN8GAoEI=";
+    persistencedSha256 = "sha256-ZBfPZyQKW9SkVdJ5cy0cxGap2oc7kyYRDOeM0XyfHfI=";
   };
 
   latest = selectHighestVersion production (generic {
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 3846e7c409b6..921107506fb9 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -24,22 +24,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "procps";
-  version = "4.0.5";
+  version = "4.0.6";
 
   # The project's releases are on SF, but git repo on gitlab.
   src = fetchurl {
     url = "mirror://sourceforge/procps-ng/procps-ng-${finalAttrs.version}.tar.xz";
-    hash = "sha256-wubRk8x4+EzW3bcqr21capFi8EcOWZIJIFf1/1GFYvo=";
+    hash = "sha256-Z76m+8OkKlNaAjDJ6JHl3ftNnTlCLUZWWimQ0azhUhY=";
   };
 
-  patches = [
-    # Fix build on Darwin. This patch can be dropped once 4.0.6 is released.
-    (fetchpatch2 {
-      url = "https://gitlab.com/procps-ng/procps/-/commit/2dc340e47669e0b0df7f71ff082e05ac5fa36615.diff";
-      hash = "sha256-4eu0MdHsCeUPiQBTdvYHlUAtSVbgputTqPRmSvh9iVs=";
-    })
-  ];
-
   buildInputs = [ ncurses ] ++ lib.optionals withSystemd [ systemdLibs ];
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/os-specific/linux/tt-kmd/default.nix b/pkgs/os-specific/linux/tt-kmd/default.nix
index fd84815df64e..f8cc8f60ad1c 100644
--- a/pkgs/os-specific/linux/tt-kmd/default.nix
+++ b/pkgs/os-specific/linux/tt-kmd/default.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "tt-kmd";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "tenstorrent";
     repo = "tt-kmd";
     tag = "ttkmd-${finalAttrs.version}";
-    hash = "sha256-MCfz5c42Jtm/SoTjyD+P5DgSzJy0T/VpwShuJNyPyTM=";
+    hash = "sha256-+4Wqj91EsPthKQXajiDd9Y77oTp9BNqCgFCQrTAp6ag=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
diff --git a/pkgs/servers/home-assistant/custom-components/fellow/package.nix b/pkgs/servers/home-assistant/custom-components/fellow/package.nix
index 416bea768d9f..ef9db5551b64 100644
--- a/pkgs/servers/home-assistant/custom-components/fellow/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/fellow/package.nix
@@ -10,13 +10,13 @@
 buildHomeAssistantComponent rec {
   owner = "NewsGuyTor";
   domain = "fellow";
-  version = "1.2.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "NewsGuyTor";
     repo = "FellowAiden-HomeAssistant";
     tag = "v${version}";
-    hash = "sha256-cGyGobR0lMNReWCxK7RzeqsnYJZQNRPjYqirLHjeCFI=";
+    hash = "sha256-qJizRqHcYQxcONke/++Hjh6yzHNCxfytvAJYXJWoHu8=";
   };
 
   passthru.updateScript = unstableGitUpdater { };
diff --git a/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix b/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix
index c5ed20e7c1ca..669438df7426 100644
--- a/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "homeassistant-ai";
   domain = "ha_mcp_tools";
-  version = "6.6.1";
+  version = "6.7.0";
 
   src = fetchFromGitHub {
     owner = "homeassistant-ai";
     repo = "ha-mcp";
     tag = "v${version}";
-    hash = "sha256-yAJbvfIH5ewRTip8whbOKxE479qAihESaiLFTnhpRkY=";
+    hash = "sha256-zHa6wfRVmLfKrbAts5Fwe9rCCk57v1GoEIBxQaDAhm0=";
   };
 
   passthru.updateScript = nix-update-script {
diff --git a/pkgs/servers/home-assistant/custom-components/sensi/package.nix b/pkgs/servers/home-assistant/custom-components/sensi/package.nix
index ea6f4b0f1a05..b47abe33f390 100644
--- a/pkgs/servers/home-assistant/custom-components/sensi/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/sensi/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "iprak";
   domain = "sensi";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = domain;
     tag = "v${version}";
-    hash = "sha256-B55gFiSdWRnFMIs8vbL/euvtRcJNb5ue21RE3W5f7Ic=";
+    hash = "sha256-dyA4L/2FjyI4BM3IZHKE4UD+jUbrNs5dGKZGD1a1duY=";
   };
 
   postPatch = ''
diff --git a/pkgs/servers/home-assistant/custom-components/valetudo/package.nix b/pkgs/servers/home-assistant/custom-components/valetudo/package.nix
index ec7076d543d4..d1b7e0717600 100644
--- a/pkgs/servers/home-assistant/custom-components/valetudo/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/valetudo/package.nix
@@ -6,13 +6,13 @@
 buildHomeAssistantComponent rec {
   owner = "Hypfer";
   domain = "valetudo";
-  version = "2025.12.0";
+  version = "2026.01.1";
 
   src = fetchFromGitHub {
     owner = "Hypfer";
     repo = "hass-valetudo";
     tag = "${version}";
-    hash = "sha256-dHrN9Bbmm3J47MRmwExZH6Mi4RvRBZdQ4R1xeCewcSc=";
+    hash = "sha256-xJ8kA+ujWuen5660GWZSo90WsHpfwQVStIheaIRxAg8=";
   };
   meta = {
     description = "Valetudo for Home Assistant";
diff --git a/pkgs/servers/jackett/updater.sh b/pkgs/servers/jackett/updater.sh
deleted file mode 100755
index 1714565edd49..000000000000
--- a/pkgs/servers/jackett/updater.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts
-set -eo pipefail
-cd "$(dirname "${BASH_SOURCE[0]}")"
-
-new_version="$(curl -s "https://api.github.com/repos/jackett/jackett/releases?per_page=1" | jq -r '.[0].name')"
-old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
-
-if [[ "$new_version" == "$old_version" ]]; then
-  echo "Already up to date!"
-  exit 0
-fi
-
-cd ../../..
-update-source-version jackett "${new_version//v}"
-$(nix-build -A jackett.fetch-deps --no-out-link)
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
index c974d995696a..e4ff1e9545d0 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-metricsdrilldown-app";
-  version = "1.0.29";
-  zipHash = "sha256-Z26GlIlk9RJze++VqqCwgcveewuXGAZhlOkXOp/pbKU=";
+  version = "1.0.31";
+  zipHash = "sha256-DNWeFchied8MME9dZNp776RtGnzBe1iTZbFGWCKBWHM=";
   meta = {
     description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries";
     license = lib.licenses.agpl3Only;
diff --git a/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix
index 6642bf7a5eb3..e67adea71054 100644
--- a/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "check_ssl_cert";
-  version = "2.94.0";
+  version = "2.96.0";
 
   src = fetchFromGitHub {
     owner = "matteocorti";
     repo = "check_ssl_cert";
     tag = "v${version}";
-    hash = "sha256-t1bgW8a4g289nn34c4xnIyus7aAkZUII+/wXEIEmD2c=";
+    hash = "sha256-6j2+ScWgRDs/YaJzouzWQ92VlSty4juHKwo9/q/C+v0=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
index d56ef90deba4..87850a7d20a6 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
@@ -45,7 +45,7 @@ postgresqlBuildExtension (finalAttrs: {
     '';
     homepage = "https://github.com/reorg/pg_repack";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ danbst ];
+    maintainers = [ ];
     inherit (postgresql.meta) platforms;
     mainProgram = "pg_repack";
   };
diff --git a/pkgs/servers/sql/postgresql/ext/pg_search.nix b/pkgs/servers/sql/postgresql/ext/pg_search.nix
new file mode 100644
index 000000000000..38cafe5e9e3a
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/ext/pg_search.nix
@@ -0,0 +1,110 @@
+{
+  buildPgrxExtension,
+  cargo-pgrx_0_16_1,
+  fetchFromGitHub,
+  fetchurl,
+  lib,
+  nix-update-script,
+  pkg-config,
+  postgresql,
+  stdenv,
+}:
+
+let
+  # https://github.com/paradedb/paradedb/blob/v0.21.8/Cargo.lock#L3316-L3346
+  linderaVersion = "1.4.1";
+  linderaWebsite = "https://lindera.dev";
+
+  # pg_search's tokenizer uses several language dictionaries used by the Lindera crate
+  dictionaries = {
+    # https://github.com/lindera/lindera/blob/v1.4.1/lindera-ko-dic/build.rs#L15-L22
+    lindera-ko-dic = rec {
+      language = "Korean";
+      filename = "mecab-ko-dic-2.1.1-20180720.tar.gz";
+      source = fetchurl {
+        url = "${linderaWebsite}/${filename}";
+        hash = "sha256-cCztIcYWfp2a68Z0q17lSvWNREOXXylA030FZ8AgWRo=";
+      };
+    };
+
+    # https://github.com/lindera/lindera/blob/v1.4.1/lindera-cc-cedict/build.rs#L15-L22
+    lindera-cc-cedict = rec {
+      language = "Chinese";
+      filename = "CC-CEDICT-MeCab-0.1.0-20200409.tar.gz";
+      source = fetchurl {
+        url = "${linderaWebsite}/${filename}";
+        hash = "sha256-7Tz54+yKgGR/DseD3Ana1DuMytLplPXqtv8TpB0JFsg=";
+      };
+    };
+
+    # https://github.com/lindera/lindera/blob/v1.4.1/lindera-ipadic/build.rs#L15-L22
+    lindera-ipadic = rec {
+      language = "Japanese";
+      filename = "mecab-ipadic-2.7.0-20250920.tar.gz";
+      source = fetchurl {
+        url = "${linderaWebsite}/${filename}";
+        hash = "sha256-p7qfZF/+cJTlauHEqB0QDfj7seKLvheSYi6XKOFi2z0=";
+      };
+    };
+  };
+in
+buildPgrxExtension (finalAttrs: {
+  pname = "pg_search";
+  version = "0.21.8";
+
+  src = fetchFromGitHub {
+    owner = "paradedb";
+    repo = "paradedb";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-gvQOfyFU8SVtAJTGw0EuRatfDVZRqpv7WhIqYYZYbgc=";
+  };
+
+  cargoHash = "sha256-NRrDmswQ+oiVNeIbhfhDA7k4wOxotTLsOuT7WMewX6Y=";
+
+  inherit postgresql;
+
+  # Lindera dictionaries are copied to a temporary directory and the
+  # LINDERA_CACHE environment variable prevents the build.rs files in
+  # the Lindera crates from downloading their dictionary from an
+  # external URL, which doesn't work in the Nix sandbox
+  preConfigure = ''
+    export LINDERA_CACHE=$TMPDIR/lindera-cache
+    mkdir -p $LINDERA_CACHE/${linderaVersion}
+
+    ${lib.concatMapStringsSep "\n" (dict: ''
+      echo "Copying ${dict.language} dictionary to Lindera cache"
+      cp ${dict.source} $LINDERA_CACHE/${linderaVersion}/${dict.filename}
+    '') (lib.attrValues dictionaries)}
+
+    echo "Lindera cache prepared at $LINDERA_CACHE"
+  '';
+
+  # https://github.com/paradedb/paradedb/blob/v0.21.8/Cargo.toml#L38-L39
+  cargo-pgrx = cargo-pgrx_0_16_1;
+
+  # https://github.com/paradedb/paradedb/tree/v0.21.8/pg_search
+  cargoPgrxFlags = [
+    "--package"
+    "pg_search"
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  # pgrx tests try to install the extension into postgresql nix store
+  doCheck = false;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Transactional Elasticsearch alternative as a PostgreSQL extension";
+    homepage = "https://paradedb.com";
+    changelog = "https://github.com/paradedb/paradedb/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.agpl3Only;
+    maintainers = [ lib.maintainers.lucperkins ];
+    # https://github.com/paradedb/paradedb/blob/v0.21.8/pg_search/Cargo.toml#L14-L18
+    broken = lib.versionOlder postgresql.version "14";
+    platforms = postgresql.meta.platforms;
+  };
+})
diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
index 4b2b2266e65f..6caa133c36b1 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
@@ -38,6 +38,6 @@ postgresqlBuildExtension {
     '';
     platforms = postgresql.meta.platforms;
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ danbst ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index b235f0a37d7c..7db5e87ceff6 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -222,14 +222,14 @@ lib.makeExtensible (
 
       nixComponents_git =
         (nixDependencies.callPackage ./modular/packages.nix rec {
-          version = "2.34pre20251217_${lib.substring 0 8 src.rev}";
+          version = "2.34pre20260217_${lib.substring 0 8 src.rev}";
           inherit teams;
           otherSplices = generateSplicesForNixComponents "nixComponents_git";
           src = fetchFromGitHub {
             owner = "NixOS";
             repo = "nix";
-            rev = "b6add8dcc6f4f6feb1ce83aaffe4d7e660e6f616";
-            hash = "sha256-2au7PdQ4HXSuktTPCtOJoD/LNjqMwbHIJmuzEYW1b7I=";
+            rev = "6e725093e6d4dda4f6bdbab20ea3e9e9687225ec";
+            hash = "sha256-dhPINhGyN3N+3zMSdM51DRTEKCPGCNO3+QsbhD0/nFc=";
           };
         }).appendPatches
           patches_common;
diff --git a/pkgs/tools/package-management/nix/modular/packaging/components.nix b/pkgs/tools/package-management/nix/modular/packaging/components.nix
index 02b927df5a23..2282ff3d07ff 100644
--- a/pkgs/tools/package-management/nix/modular/packaging/components.nix
+++ b/pkgs/tools/package-management/nix/modular/packaging/components.nix
@@ -370,6 +370,7 @@ in
   nix-cmd = callPackage ../src/libcmd/package.nix { };
 
   nix-cli = callPackage ../src/nix/package.nix { };
+  ${whenAtLeast "2.34pre" "nix-nswrapper"} = callPackage ../src/nswrapper/package.nix { };
 
   nix-functional-tests = callPackage ../tests/functional/package.nix { };
 
diff --git a/pkgs/tools/package-management/nix/modular/packaging/everything.nix b/pkgs/tools/package-management/nix/modular/packaging/everything.nix
index 8f40b8e4250f..79cce347cc88 100644
--- a/pkgs/tools/package-management/nix/modular/packaging/everything.nix
+++ b/pkgs/tools/package-management/nix/modular/packaging/everything.nix
@@ -35,6 +35,8 @@
 
   nix-cli,
 
+  nix-nswrapper ? null,
+
   nix-functional-tests,
 
   nix-manual,
@@ -177,6 +179,9 @@ stdenv.mkDerivation (finalAttrs: {
       # Forwarded outputs
       ln -sT ${nix-manual} $doc
       ln -sT ${nix-manual.man} $man
+    ''
+    + lib.optionalString (stdenv.isLinux && lib.versionAtLeast version "2.34pre") ''
+      lndir ${nix-nswrapper} $out
     '';
 
   passthru = {
diff --git a/pkgs/tools/package-management/nix/modular/src/libstore-test-support/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore-test-support/package.nix
index 1211ef6b33e9..ba6498582e73 100644
--- a/pkgs/tools/package-management/nix/modular/src/libstore-test-support/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libstore-test-support/package.nix
@@ -8,6 +8,8 @@
 
   rapidcheck,
 
+  gtest,
+
   # Configuration Options
 
   version,
@@ -24,7 +26,8 @@ mkMesonLibrary (finalAttrs: {
     nix-store
     nix-store-c
     rapidcheck
-  ];
+  ]
+  ++ lib.optional (lib.versionAtLeast version "2.34pre") gtest;
 
   mesonFlags = [
   ];
diff --git a/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix
index cc0f55790f13..e31044270a76 100644
--- a/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix
@@ -10,6 +10,8 @@
   nix-store-test-support,
   sqlite,
 
+  openssl,
+
   rapidcheck,
   gtest,
   runCommand,
@@ -60,7 +62,10 @@ mkMesonExecutable (finalAttrs: {
         runCommand "${finalAttrs.pname}-run"
           {
             meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages;
-            buildInputs = [ writableTmpDirAsHomeHook ];
+            buildInputs = [
+              writableTmpDirAsHomeHook
+            ]
+            ++ lib.optional (lib.versionAtLeast version "2.34pre") openssl;
           }
           ''
             export _NIX_TEST_UNIT_DATA=${data + "/src/libstore-tests/data"}
diff --git a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix
index 3039120e37dc..70cd4ef68356 100644
--- a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix
@@ -8,6 +8,7 @@
   nix-util,
   boost,
   curl,
+  cmake,
   aws-c-common,
   aws-sdk-cpp,
   aws-crt-cpp,
@@ -35,7 +36,9 @@ mkMesonLibrary (finalAttrs: {
 
   workDir = ./.;
 
-  nativeBuildInputs = lib.optional embeddedSandboxShell unixtools.hexdump;
+  nativeBuildInputs =
+    lib.optional embeddedSandboxShell unixtools.hexdump
+    ++ lib.optional (withAWS && lib.versionAtLeast version "2.34pre") cmake;
 
   buildInputs = [
     boost
diff --git a/pkgs/tools/package-management/nix/modular/src/nswrapper/package.nix b/pkgs/tools/package-management/nix/modular/src/nswrapper/package.nix
new file mode 100644
index 000000000000..50e25aa54110
--- /dev/null
+++ b/pkgs/tools/package-management/nix/modular/src/nswrapper/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  mkMesonExecutable,
+
+  nix-util,
+  # Configuration Options
+
+  version,
+}:
+
+let
+  inherit (lib) fileset;
+in
+
+mkMesonExecutable (finalAttrs: {
+  pname = "nix-nswrapper";
+  inherit version;
+
+  workDir = ./.;
+  fileset = fileset.unions [
+    ../../nix-meson-build-support
+    ./nix-meson-build-support
+    ../../.version
+    ./.version
+    ./meson.build
+
+    (fileset.fileFilter (file: file.hasExt "cc") ./.)
+    (fileset.fileFilter (file: file.hasExt "hh") ./.)
+  ];
+
+  buildInputs = [
+    nix-util
+  ];
+
+  mesonFlags = [
+  ];
+
+  meta = {
+    mainProgram = "nix-nswrapper";
+    platforms = lib.platforms.linux;
+  };
+
+})
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 4820a367912c..f9e2b7668110 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -8,7 +8,7 @@
   json_c,
   zlib,
   docutils,
-  fastJson,
+  libfastjson,
   withKrb5 ? true,
   libkrb5,
   withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    fastJson
+    libfastjson
     libestr
     json_c
     zlib
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 545f438168dd..8a17469c6ef2 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -319,6 +319,7 @@ mapAliases {
   archivebox = throw "archivebox has been removed, since the packaged version was stuck on django 3."; # Added 2025-08-01
   archiver = throw "archiver has been removed, as it has been unmaintained upstream since November 2024"; # Added 2026-01-15
   ardour_7 = throw "ardour_7 has been removed because it relies on gtk2, please use ardour instead."; # Added 2025-10-04
+  arduinoOTA = warnAlias "'arduinoOTA' has been renamed to 'arduino-ota'" arduino-ota; # Added 2026-02-08
   argo = throw "'argo' has been renamed to/replaced by 'argo-workflows'"; # Converted to throw 2025-10-27
   aria = throw "'aria' has been renamed to/replaced by 'aria2'"; # Converted to throw 2025-10-27
   arrayfire = throw "arrayfire was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
@@ -348,6 +349,7 @@ mapAliases {
   aws-shell = throw "'aws-shell' has been removed because it is unmaintained upstream"; # Added 2026-01-18
   aws_mturk_clt = throw "'aws_mturk_clt' has been removed due to being unmaintained upstream. Use 'awscli' with 'mturk' subcommands instead."; # Added 2026-01-19
   axmldec = throw "'axmldec' has been removed as it was broken and unmaintained for 8 years"; # Added 2025-05-17
+  b43FirmwareCutter = warnAlias "'b43FirmwareCutter' has been renamed to 'b43-fwcutter'" b43-fwcutter; # Added 2026-02-08
   backlight-auto = throw "'backlight-auto' has been removed as it relies on Zig 0.12 which has been dropped."; # Added 2025-08-22
   badtouch = throw "'badtouch' has been renamed to/replaced by 'authoscope'"; # Converted to throw 2025-10-27
   banana-vera = throw "'banana-vera' has been removed as it relies on python3.10"; # Added 2026-02-09
@@ -357,6 +359,7 @@ mapAliases {
   base16-builder = throw "'base16-builder' has been removed due to being unmaintained"; # Added 2025-06-03
   basedmypy = throw "basedmypy has been deprecated by upstream. Use instead 'basedpyright' or 'ty'"; # added 2026-02-03
   baserow = throw "baserow has been removed, due to lack of maintenance"; # Added 2025-08-02
+  bashSnippets = warnAlias "'bashSnippets' has been renamed to 'bash-snippets'" bash-snippets; # Added 2026-02-08
   bazel_5 = throw "bazel_5 has been removed as it is EOL"; # Added 2025-08-09
   bazel_6 = throw "bazel_6 has been removed as it will be EOL by the release of Nixpkgs 25.11"; # Added 2025-08-19
   bc-decaf = throw "'bc-decaf' has been moved to 'linphonePackages.bc-decaf'"; # Added 2025-09-20
@@ -657,6 +660,7 @@ mapAliases {
   f3d_egl = warnAlias "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # Added 2025-07-18
   fabs = throw "'fabs' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05
   fast-cli = throw "'fast-cli' has been removed because it was unmaintainable in nixpkgs"; # Added 2025-11-17
+  fastJson = warnAlias "'fastJson' has been renamed to 'libfastjson'" libfastjson; # Added 2026-02-08
   fastnlo_toolkit = throw "'fastnlo_toolkit' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2025-10-27
   faustPhysicalModeling = warnAlias "'faustPhysicalModeling' has been renamed to 'faust-physicalmodeling'" faust-physicalmodeling; # Added 2026-02-08
   faustStk = throw "'faustStk' has been renamed to/replaced by 'faustPhysicalModeling'"; # Converted to throw 2025-10-27
@@ -687,6 +691,7 @@ mapAliases {
   fit-trackee = throw "'fit-trackee' has been renamed to/replaced by 'fittrackee'"; # Converted to throw 2025-10-27
   flashrom-stable = throw "'flashrom-stable' has been renamed to/replaced by 'flashprog'"; # Converted to throw 2025-10-27
   flatbuffers_2_0 = throw "'flatbuffers_2_0' has been renamed to/replaced by 'flatbuffers'"; # Converted to throw 2025-10-27
+  flattenReferencesGraph = warnAlias "'flattenReferencesGraph' has been renamed to 'flatten-references-graph'" flatten-references-graph; # Added 2026-02-08
   flint3 = flint; # Added 2025-09-21
   floorp = throw "floorp has been replaced with floorp-bin, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06
   floorp-unwrapped = throw "floorp-unwrapped has been replaced with floorp-bin-unwrapped, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06
@@ -755,6 +760,7 @@ mapAliases {
   freerdpUnstable = throw "'freerdpUnstable' has been renamed to/replaced by 'freerdp'"; # Converted to throw 2025-10-27
   frugal = throw "'frugal' was removed because upstream has been pulled"; # Added 2025-12-20
   fusee-launcher = throw "'fusee-launcher' was removed as upstream removed the original source repository fearing legal repercussions"; # Added 2025-07-05
+  fusionInventory = warnAlias "'fusionInventory' has been renamed to 'fusioninventory-agent'" fusioninventory-agent; # Added 2026-02-08
   futuresql = throw "'futuresql' has been renamed to/replaced by 'libsForQt5.futuresql'"; # Converted to throw 2025-10-27
   fx_cast_bridge = throw "'fx_cast_bridge' has been renamed to/replaced by 'fx-cast-bridge'"; # Converted to throw 2025-10-27
   fzf-zsh = throw "'fzf-zsh' has been removed because it was superseed by its builtin equivalent and archived upstream."; # Added 2026-01-17
@@ -907,6 +913,7 @@ mapAliases {
   infamousPlugins = infamousplugins; # Added 2026-02-08
   inotifyTools = throw "'inotifyTools' has been renamed to/replaced by 'inotify-tools'"; # Converted to throw 2025-10-27
   insync-emblem-icons = throw "'insync-emblem-icons' has been removed, use 'insync-nautilus' instead"; # Added 2025-05-14
+  intel2200BGFirmware = warnAlias "'intel2200BGFirmware' has been renamed to 'ipw2200-firmware'" ipw2200-firmware; # Added 2026-02-08
   invalidateFetcherByDrvHash = throw "'invalidateFetcherByDrvHash' has been renamed to/replaced by 'testers.invalidateFetcherByDrvHash'"; # Converted to throw 2025-10-27
   ioccheck = throw "ioccheck was dropped since it was unmaintained."; # Added 2025-07-06
   ipfs = throw "'ipfs' has been renamed to/replaced by 'kubo'"; # Converted to throw 2025-10-27
@@ -914,6 +921,7 @@ mapAliases {
   ipfs-migrator-all-fs-repo-migrations = throw "'ipfs-migrator-all-fs-repo-migrations' has been renamed to/replaced by 'kubo-fs-repo-migrations'"; # Converted to throw 2025-10-27
   ipfs-migrator-unwrapped = throw "'ipfs-migrator-unwrapped' has been renamed to/replaced by 'kubo-migrator-unwrapped'"; # Converted to throw 2025-10-27
   ir.lv2 = ir-lv2; # Added 2025-09-37
+  ircdHybrid = warnAlias "'ircdHybrid' has been renamed to 'ircd-hybrid'" ircd-hybrid; # Added 2026-02-08
   iroh = throw "iroh has been split into iroh-dns-server and iroh-relay"; # Added 2025-11-06
   isl_0_24 = throw "isl_0_24 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-10-18
   iso-flags-png-320x420 = throw "'iso-flags-png-320x420' has been renamed to/replaced by 'iso-flags-png-320x240'"; # Converted to throw 2025-10-27
@@ -925,6 +933,7 @@ mapAliases {
   jami-client-qt = throw "'jami-client-qt' has been renamed to/replaced by 'jami-client'"; # Converted to throw 2025-10-27
   jami-daemon = throw "'jami-daemon' has been renamed to/replaced by 'jami.daemon'"; # Converted to throw 2025-10-27
   jarowinkler-cpp = throw "'jarowinkler-cpp' has been removed because it was deprecated and archived upstream. Consider using 'rapidfuzz-cpp' instead"; # Added 2026-01-15
+  javaCup = warnAlias "'javaCup' has been renamed to 'java-cup'" java-cup; # Added 2026-02-08
   jdk23 = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04
   jdk23_headless = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04
   jdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
@@ -1028,6 +1037,7 @@ mapAliases {
   libkkc = throw "'libkkc' has been removed due to lack of maintenance. Consider using anthy instead"; # Added 2025-08-28
   libkkc-data = throw "'libkkc-data' has been removed as it depended on libkkc which was removed"; # Added 2025-08-28
   libLAS = liblas; # Added 2026-02-08
+  liblastfmSF = warnAlias "'liblastfmSF' has been renamed to 'liblastfm-vambrose'" liblastfm-vambrose; # Added 2026-02-08
   liblinphone = throw "'liblinphone' has been moved to 'linphonePackages.liblinphone'"; # Added 2025-09-20
   libmesode = throw "'libmesode' has been removed because it was deprecated and archived upstream. Consider using 'libstrophe' instead"; # Added 2026-01-15
   libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17
@@ -1434,6 +1444,7 @@ mapAliases {
   NSPlist = throw "'NSPlist' has been renamed to/replaced by 'nsplist'"; # Converted to throw 2025-10-27
   nuget-to-nix = throw "nuget-to-nix has been removed as it was deprecated in favor of nuget-to-json. Please use nuget-to-json instead"; # Added 2025-08-28
   nushellFull = throw "'nushellFull' has been renamed to/replaced by 'nushell'"; # Converted to throw 2025-10-27
+  nuXmv = warnAlias "'nuXmv' has been renamed to 'nuxmv'" nuxmv; # Added 2026-02-08
   o = throw "'o' has been renamed to/replaced by 'orbiton'"; # Converted to throw 2025-10-27
   oam-tools = throw "'oam-tools' has been become part of amass"; # Added 2025-12-21
   oathToolkit = throw "'oathToolkit' has been renamed to/replaced by 'oath-toolkit'"; # Converted to throw 2025-10-27
@@ -1653,6 +1664,7 @@ mapAliases {
   qutebrowser-qt5 = lib.warnOnInstantiate "'qutebrowser-qt5' has been removed as it depended on vulnerable and outdated qt5 webengine" qutebrowser; # Added 2026-01-14
   qv2ray = throw "'qv2ray' has been removed as it was unmaintained"; # Added 2025-06-03
   ra-multiplex = lib.warnOnInstantiate "'ra-multiplex' has been renamed to/replaced by 'lspmux'" lspmux; # Added 2025-10-27
+  rabbit = throw "'rabbit' has been renamed to/replaced by 'rabbit-ng'"; # Added 2026-02-18
   radiance = throw "'radiance' has been removed as it was broken for a long time"; # Added 2026-01-02
   radicale3 = throw "'radicale3' has been renamed to/replaced by 'radicale'"; # Converted to throw 2025-10-27
   railway-travel = throw "'railway-travel' has been renamed to/replaced by 'diebahn'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4a21a0e031e..cc60eeeb4a4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -687,6 +687,8 @@ with pkgs;
 
   fetchgx = callPackage ../build-support/fetchgx { };
 
+  fetchItchIo = callPackage ../build-support/fetchitchio { };
+
   fetchPypi = callPackage ../build-support/fetchpypi { };
 
   fetchPypiLegacy = callPackage ../build-support/fetchpypilegacy { };
@@ -2042,8 +2044,6 @@ with pkgs;
 
   unify = with python3Packages; toPythonApplication unify;
 
-  persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { };
-
   inherit (import ../development/libraries/libsbsms pkgs)
     libsbsms
     libsbsms_2_0_2
@@ -2687,8 +2687,6 @@ with pkgs;
     isl_0_27
     ;
 
-  jackett = callPackage ../servers/jackett { };
-
   jamesdsp-pulse = callPackage ../by-name/ja/jamesdsp/package.nix {
     usePipewire = false;
     usePulseaudio = true;
@@ -2792,8 +2790,6 @@ with pkgs;
 
   md2gemini = with python3.pkgs; toPythonApplication md2gemini;
 
-  md2pdf = with python3Packages; toPythonApplication md2pdf;
-
   mdcat = callPackage ../tools/text/mdcat {
     inherit (python3Packages) ansi2html;
   };
@@ -3294,8 +3290,6 @@ with pkgs;
 
   tabview = with python3Packages; toPythonApplication tabview;
 
-  tautulli = python3Packages.callPackage ../servers/tautulli { };
-
   inherit (callPackage ../development/tools/pnpm { })
     pnpm_8
     pnpm_9
@@ -3310,10 +3304,6 @@ with pkgs;
 
   po4a = perlPackages.Po4a;
 
-  polaris = callPackage ../servers/polaris { };
-
-  polaris-web = callPackage ../servers/polaris/web.nix { };
-
   proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { };
 
   pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot;
@@ -3437,10 +3427,6 @@ with pkgs;
   # aka., pgp-tools
   simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { };
 
-  sks = callPackage ../servers/sks {
-    ocamlPackages = ocaml-ng.ocamlPackages_4_12;
-  };
-
   snapcast = callPackage ../applications/audio/snapcast {
     pulseaudioSupport = config.pulseaudio or stdenv.hostPlatform.isLinux;
   };
@@ -6742,10 +6728,6 @@ with pkgs;
     '';
   });
 
-  isso = callPackage ../servers/isso {
-    nodejs = nodejs_20;
-  };
-
   itk_5_2 = callPackage ../development/libraries/itk/5.2.x.nix {
     enableRtk = false;
   };
@@ -6768,7 +6750,6 @@ with pkgs;
 
   libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; };
   libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; };
-  libasn1c = callPackage ../servers/osmocom/libasn1c/default.nix { };
 
   libbass = (callPackage ../development/libraries/audio/libbass { }).bass;
   libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx;
@@ -8208,8 +8189,6 @@ with pkgs;
     erlang = beamMinimalPackages.erlang;
   };
 
-  dcnnt = python3Packages.callPackage ../servers/dcnnt { };
-
   dict = callPackage ../servers/dict {
     flex = flex_2_5_35;
     libmaa = callPackage ../servers/dict/libmaa.nix { };
@@ -8221,11 +8200,6 @@ with pkgs;
 
   dodgy = with python3Packages; toPythonApplication dodgy;
 
-  prosody = callPackage ../servers/xmpp/prosody {
-    withExtraLibs = [ ];
-    withExtraLuaPackages = _: [ ];
-  };
-
   inherit (callPackages ../servers/firebird { })
     firebird_4
     firebird_3
@@ -8350,8 +8324,6 @@ with pkgs;
     ];
   };
 
-  minio = callPackage ../servers/minio { };
-
   mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { };
 
   moodle = callPackage ../servers/web-apps/moodle { };
@@ -8527,10 +8499,6 @@ with pkgs;
     msVarsTemplate = stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch64;
   };
 
-  tang = callPackage ../servers/tang {
-    asciidoc = asciidoc-full;
-  };
-
   inherit (import ../servers/sql/postgresql pkgs)
     postgresqlVersions
     postgresqlJitVersions
@@ -8675,8 +8643,6 @@ with pkgs;
 
   pypiserver = with python3Packages; toPythonApplication pypiserver;
 
-  qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { };
-
   rethinkdb = callPackage ../servers/nosql/rethinkdb {
     stdenv = clangStdenv;
     libtool = cctools;
@@ -8702,8 +8668,6 @@ with pkgs;
 
   scalene = with python3Packages; toPythonApplication scalene;
 
-  shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; };
-
   shairport-sync-airplay2 = shairport-sync.override {
     enableAirplay2 = true;
   };
@@ -8721,11 +8685,6 @@ with pkgs;
     sensu-go-cli
     ;
 
-  shishi = callPackage ../servers/shishi {
-    pam = if stdenv.hostPlatform.isLinux then pam else null;
-    # see also openssl, which has/had this same trick
-  };
-
   spacecookie = haskell.lib.compose.justStaticExecutables haskellPackages.spacecookie;
 
   inherit (callPackages ../servers/http/tomcat { })
@@ -9326,11 +9285,7 @@ with pkgs;
 
   ### DATA
 
-  adwaita-qt = libsForQt5.callPackage ../data/themes/adwaita-qt { };
-
-  adwaita-qt6 = qt6Packages.callPackage ../data/themes/adwaita-qt {
-    useQt6 = true;
-  };
+  adwaita-qt6 = adwaita-qt.override { useQt6 = true; };
 
   dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { });
 
@@ -12419,19 +12374,10 @@ with pkgs;
     ;
   kops = kops_1_33;
 
-  lilypond = callPackage ../misc/lilypond { };
-
-  lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { };
-
-  lilypond-unstable-with-fonts = callPackage ../misc/lilypond/with-fonts.nix {
+  lilypond-unstable-with-fonts = lilypond-with-fonts.override {
     lilypond = lilypond-unstable;
-    openlilylib-fonts = openlilylib-fonts.override {
-      lilypond = lilypond-unstable;
-    };
   };
 
-  lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { };
-
   openlilylib-fonts = recurseIntoAttrs (callPackage ../misc/lilypond/fonts.nix { });
 
   nixDependencies = recurseIntoAttrs (
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index eb097db646e8..dc644c06733c 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -27,6 +27,26 @@ let
     lib.mapAttrs (
       n: alias: removeDistribute (removeRecurseForDerivations (checkInPkgs n alias))
     ) aliases;
+
+  warnAlias =
+    msg: v:
+    if lib.isDerivation v then
+      lib.warnOnInstantiate msg v
+    else if lib.isAttrs v then
+      lib.mapAttrs (_: lib.warn msg) v
+    else if lib.isFunction v then
+      arg: lib.warn msg (v arg)
+    else if lib.isList v then
+      map (lib.warn msg) v
+    else
+      # Can’t do better than this, and a `throw` would be more
+      # disruptive for users…
+      #
+      # `nix search` flags up warnings already, so hopefully this won’t
+      # make things much worse until we have proper CI for aliases,
+      # especially since aliases of paths and numbers are presumably
+      # not common.
+      lib.warn msg v;
 in
 
 ### Deprecated aliases - for backward compatibility
@@ -58,6 +78,7 @@ mapAliases {
   abodepy = throw "'abodepy' has been renamed to/replaced by 'jaraco-abode'"; # Converted to throw 2025-10-29
   aioinflux = throw "'aioinflux' was removed because it is abandonned upstream. For InfluxDB v2+ support, please use the official Python client library"; # Added 2026-01-15
   aiosenz = throw "aiosenz was removed because Home Assistant switched to pysenz"; # added 2025-12-29
+  aioshutil = throw "'aioshutil' was removed because uiprotect no longer depends on it"; # added 2026-02-16
   amazon-kclpy = throw "amazon-kclpy has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
   amazon_kclpy = throw "'amazon_kclpy' has been renamed to/replaced by 'amazon-kclpy'"; # Converted to throw 2025-10-29
   amqplib = throw "amqplib has been removed as it was unmaintained upstream"; # Added 2025-11-22
@@ -384,6 +405,7 @@ mapAliases {
   pyRFC3339 = throw "'pyRFC3339' has been renamed to/replaced by 'pyrfc3339'"; # Converted to throw 2025-10-29
   Pyro4 = throw "'Pyro4' has been renamed to/replaced by 'pyro4'"; # Converted to throw 2025-10-29
   Pyro5 = throw "'Pyro5' has been renamed to/replaced by 'pyro5'"; # Converted to throw 2025-10-29
+  pyrr = throw "pyrr has been removed because it is incompatible with NumPy 2.0+"; # Added 2026-02-18
   PyRSS2Gen = throw "'PyRSS2Gen' has been renamed to/replaced by 'pyrss2gen'"; # Converted to throw 2025-10-29
   pyside6-fluent-widgets = throw "pyside6-fluent-widgets has been removed, since it is unmaintained"; # added 2025-08-20
   pysidesix-frameless-window = throw "pysidesix-frameless-window has been removed, since it is unmaintained"; # added 2025-08-20
@@ -526,6 +548,7 @@ mapAliases {
   tvdb_api = throw "'tvdb_api' has been renamed to/replaced by 'tvdb-api'"; # Converted to throw 2025-10-29
   tweedledum = throw "'tweedledum' has been removed due to lack of upstream maintenance."; # Added 2025-11-22
   typed-ast = throw "typed-ast was removed because it went end of life in July 2023"; # added 2025-05-24
+  typer-slim = warnAlias "typer-slim was an alias package of typer that only depended on it and has been removed." typer; # added 2026-02-16
   types-typed-ast = throw "types-typed-ast was removed because so was typed-ast"; # added 2025-05-24
   typesentry = throw "typesentry was removed because it was broken and unmaintained"; # added 2026-02-02
   typesystem = throw "'typesystem' has been removed as it was broken, unmaintained, and archived upstream"; # Added 2025-11-27
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c5bb76eb0f30..9e0af9171911 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -494,8 +494,6 @@ self: super: with self; {
 
   aioshelly = callPackage ../development/python-modules/aioshelly { };
 
-  aioshutil = callPackage ../development/python-modules/aioshutil { };
-
   aiosignal = callPackage ../development/python-modules/aiosignal { };
 
   aioskybell = callPackage ../development/python-modules/aioskybell { };
@@ -6180,6 +6178,8 @@ self: super: with self; {
 
   ghidra-bridge = callPackage ../development/python-modules/ghidra-bridge { };
 
+  ghmap = callPackage ../development/python-modules/ghmap { };
+
   ghome-foyer-api = callPackage ../development/python-modules/ghome-foyer-api { };
 
   ghostscript = callPackage ../development/python-modules/ghostscript { };
@@ -11217,6 +11217,10 @@ self: super: with self; {
 
   ocrmypdf = callPackage ../development/python-modules/ocrmypdf { tesseract = pkgs.tesseract5; };
 
+  ocrmypdf_16 = callPackage ../development/python-modules/ocrmypdf_16 {
+    tesseract = pkgs.tesseract5;
+  };
+
   od = callPackage ../development/python-modules/od { };
 
   odc-geo = callPackage ../development/python-modules/odc-geo { };
@@ -14639,8 +14643,6 @@ self: super: with self; {
 
   pyroute2 = callPackage ../development/python-modules/pyroute2 { };
 
-  pyrr = callPackage ../development/python-modules/pyrr { };
-
   pyrsistent = callPackage ../development/python-modules/pyrsistent { };
 
   pyrss2gen = callPackage ../development/python-modules/pyrss2gen { };
@@ -19621,8 +19623,6 @@ self: super: with self; {
 
   typer-shell = callPackage ../development/python-modules/typer-shell { };
 
-  typer-slim = callPackage ../development/python-modules/typer-slim { };
-
   types-aiobotocore = callPackage ../development/python-modules/types-aiobotocore { };
 
   inherit (callPackage ../development/python-modules/types-aiobotocore-packages { })