diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1d1db79e5894..5720aff8e36c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -62,7 +62,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
 
-      - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
         with:
           # Sandbox is disabled on MacOS by default.
           extra_nix_config: sandbox = true
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 59b801f0c0d1..b9f2246e768a 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -85,7 +85,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
 
-      - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         continue-on-error: true
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index aaf26eae3014..28b5e8c99f61 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -54,7 +54,7 @@ jobs:
             ci/pinned.json
 
       - name: Install Nix
-        uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+        uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
 
       - name: Load supported versions
         id: versions
@@ -100,7 +100,7 @@ jobs:
           target-as-trusted-at: ${{ inputs.targetSha }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+        uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         continue-on-error: true
@@ -189,7 +189,7 @@ jobs:
           merge-multiple: true
 
       - name: Install Nix
-        uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+        uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
 
       - name: Combine all output paths and eval stats
         run: |
@@ -352,7 +352,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+        uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
 
       - name: Run misc eval tasks in parallel
         run: |
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 95ad536571a8..4c18d3f7d1b6 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -35,7 +35,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
 
       # TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well,
       # because the cache would be invalidated on every commit - treefmt checks every file.
@@ -70,7 +70,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         continue-on-error: true
@@ -100,7 +100,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
 
-      - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31
+      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         continue-on-error: true
diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index 300d50e91013..40a0566a9f8e 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -32,6 +32,18 @@
 - `nodePackages.prebuild-install` was removed because it appeared to be unmaintained upstream.
   See [upstream's recommendations for alternatives](https://github.com/prebuild/prebuild-install#note).
 
+- `davis` made changes to the `IMAP_AUTH_URL` option. The flags are now standalone parameters that you need to fill:
+  - Before:
+    ```env
+    IMAP_AUTH_URL={imap.gmail.com:993/imap/ssl/novalidate-cert}
+    ```
+  - After:
+    ```env
+    IMAP_AUTH_URL=imap.mydomain.com:993
+    IMAP_ENCRYPTION_METHOD=ssl
+    IMAP_CERTIFICATE_VALIDATION=false
+    ```
+
 - `python3packages.pillow-avif-plugin` has been removed as the functionality is included in `python3packages.pillow` directly since version 11.3.
 
 ## Other Notable Changes {#sec-nixpkgs-release-26.05-notable-changes}
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b4a42f031ea5..c26aac757ae0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6612,6 +6612,12 @@
     github = "dietmarw";
     githubId = 9332;
   };
+  Dietr1ch = {
+    name = "Dietrich Daroch";
+    github = "Dietr1ch";
+    githubId = 2096594;
+    email = "Dietrich@Daroch.me";
+  };
   different-name = {
     name = "different-name";
     email = "hello@different-name.dev";
@@ -10845,6 +10851,12 @@
     githubId = 2090758;
     keys = [ { fingerprint = "24F4 1925 28C4 8797 E539  F247 DB2D 93D1 BFAA A6EA"; } ];
   };
+  hythera = {
+    name = "Hythera";
+    github = "Hythera";
+    githubId = 87016780;
+    matrix = "@hythera:matrix.org";
+  };
   hyzual = {
     email = "hyzual@gmail.com";
     github = "Hyzual";
@@ -18062,7 +18074,7 @@
   mynacol = {
     github = "Mynacol";
     githubId = 26695166;
-    name = "Paul Prechtel";
+    name = "Mynacol";
   };
   myrl = {
     email = "myrl.0xf@gmail.com";
@@ -18643,6 +18655,12 @@
     githubId = 151337;
     name = "Nick Novitski";
   };
+  nickthegroot = {
+    name = "Nick DeGroot";
+    email = "nick@nickthegroot.com";
+    github = "nickthegroot";
+    githubId = 1966472;
+  };
   nico202 = {
     email = "anothersms@gmail.com";
     github = "nico202";
diff --git a/nixos/modules/hardware/facter/camera/default.nix b/nixos/modules/hardware/facter/camera/default.nix
new file mode 100644
index 000000000000..2944c241fac5
--- /dev/null
+++ b/nixos/modules/hardware/facter/camera/default.nix
@@ -0,0 +1,3 @@
+{
+  imports = [ ./ipu6.nix ];
+}
diff --git a/nixos/modules/hardware/facter/camera/ipu6-devices.json b/nixos/modules/hardware/facter/camera/ipu6-devices.json
new file mode 100644
index 000000000000..b3b770f15324
--- /dev/null
+++ b/nixos/modules/hardware/facter/camera/ipu6-devices.json
@@ -0,0 +1,3 @@
+{
+    "8086:9A19:17AA:508B/0004-0080-0001": true
+}
diff --git a/nixos/modules/hardware/facter/camera/ipu6.nix b/nixos/modules/hardware/facter/camera/ipu6.nix
new file mode 100644
index 000000000000..5319d8bf3d49
--- /dev/null
+++ b/nixos/modules/hardware/facter/camera/ipu6.nix
@@ -0,0 +1,115 @@
+{ config, lib, ... }:
+let
+  inherit (config.hardware.facter) report detected;
+  facterLib = import ../lib.nix lib;
+
+  isCpuGeneration =
+    _family: models:
+    facterLib.hasIntelCpu report
+    && lib.any (
+      actual: (actual.family or 0) == 6 && builtins.elem (actual.model or 0) models
+    ) report.hardware.cpu;
+
+  # Family model combinations have been looked up at https://en.wikichip.org/wiki/intel/cpuid
+  isTigerLake = isCpuGeneration 6 [
+    140 # Combination tested on actual hardware
+    141
+  ];
+
+  isAdlerLake = isCpuGeneration 6 [
+    151
+    154
+  ];
+
+  isRaptorLake = isCpuGeneration 6 [
+    183
+    186
+    190
+    191
+  ];
+
+  isMeteorLake = isCpuGeneration 6 [
+    170
+    171
+    172
+  ];
+
+  devices = builtins.fromJSON (builtins.readFile ./ipu6-devices.json);
+  isCameraSupported =
+    let
+      default = {
+        value = 0;
+      };
+    in
+    lib.any (
+      {
+        base_class ? default,
+        sub_class ? default,
+        vendor ? default,
+        sub_vendor ? default,
+        device ? default,
+        sub_device ? default,
+        revision ? default,
+        bus_type ? {
+          name = "";
+        },
+        ...
+      }:
+      let
+        baseClassHex = facterLib.toZeroPaddedHex base_class.value;
+        subClassHex = facterLib.toZeroPaddedHex sub_class.value;
+        vendorHex = facterLib.toZeroPaddedHex vendor.value;
+        subVendorHex = facterLib.toZeroPaddedHex sub_vendor.value;
+        deviceHex = facterLib.toZeroPaddedHex device.value;
+        subDeviceHex = facterLib.toZeroPaddedHex sub_device.value;
+        revisionHex = facterLib.toZeroPaddedHex revision.value;
+      in
+      bus_type.name == "PCI"
+      && devices
+      ? "${vendorHex}:${deviceHex}:${subVendorHex}:${subDeviceHex}/${baseClassHex}-${subClassHex}-${revisionHex}"
+    );
+in
+{
+  options.hardware.facter.detected.camera.ipu6.enable =
+    let
+      cameraSupported =
+        isCameraSupported (report.hardware.unknown or [ ])
+        || isCameraSupported (report.hardware.pci or [ ]);
+
+      cpuSupported = lib.any (generation: generation) [
+        isTigerLake
+        isAdlerLake
+        isRaptorLake
+        isMeteorLake
+      ];
+    in
+    lib.mkEnableOption "webcams using ipu6 from Intel"
+    // {
+      default = cameraSupported && cpuSupported;
+      defaultText = "hardware dependent";
+    };
+
+  config.hardware.ipu6 = lib.mkIf detected.camera.ipu6.enable {
+    enable = true;
+    platform =
+      if isTigerLake then
+        "ipu6"
+      else if isAdlerLake || isRaptorLake then
+        "ipu6ep"
+      else if isMeteorLake then
+        "ipu6epmtl"
+      else
+        throw "Unexpected CPU generation for ipu6 detected.";
+  };
+
+  config.warnings =
+    let
+      isKernel6_16OrLater = lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.16";
+      inherit (detected.camera) ipu6;
+    in
+    lib.optional (isKernel6_16OrLater && ipu6.enable) ''
+      A regression bug can occur when combining ipu6 with kernel version 6.16 or later.
+      This will most likely prevent your system from properly suspending or shutting down.
+      For more information see: https://github.com/intel/ipu6-drivers/issues/381
+    '';
+}
diff --git a/nixos/modules/hardware/facter/default.nix b/nixos/modules/hardware/facter/default.nix
index aa8a1ca4175e..12499b5ad31f 100644
--- a/nixos/modules/hardware/facter/default.nix
+++ b/nixos/modules/hardware/facter/default.nix
@@ -6,6 +6,7 @@
 {
   imports = [
     ./bluetooth.nix
+    ./camera
     ./disk.nix
     ./fingerprint
     ./firmware.nix
diff --git a/nixos/modules/hardware/facter/lib.nix b/nixos/modules/hardware/facter/lib.nix
index 099254cbce8d..db9f70b71b76 100644
--- a/nixos/modules/hardware/facter/lib.nix
+++ b/nixos/modules/hardware/facter/lib.nix
@@ -28,7 +28,7 @@ let
     ) cpus;
 
   # Extract all driver_modules from a list of hardware entries
-  collectDrivers = list: lib.catAttrs "driver_modules" list;
+  collectDrivers = list: lib.foldl' (lst: value: lst ++ value.driver_modules or [ ]) [ ] list;
 
   # Convert number to zero-padded 4-digit hex string (for USB device IDs)
   toZeroPaddedHex =
diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index 965ef9313b53..35fb022631e0 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -1969,7 +1969,7 @@ in
       after = [ "network.target" ];
       serviceConfig = {
         ExecStart =
-          "${cfg.package}/bin/prometheus"
+          "${lib.getExe cfg.package}"
           + optionalString (length cmdlineArgs != 0) (" \\\n  " + concatStringsSep " \\\n  " cmdlineArgs);
         ExecReload = mkIf cfg.enableReload "+${reload}/bin/reload-prometheus";
         User = "prometheus";
@@ -1980,6 +1980,7 @@ in
         StateDirectory = cfg.stateDir;
         StateDirectoryMode = "0700";
         # Hardening
+        CapabilityBoundingSet = [ "" ];
         DeviceAllow = [ "/dev/null rw" ];
         DevicePolicy = "strict";
         LockPersonality = true;
diff --git a/nixos/modules/services/security/reaction.nix b/nixos/modules/services/security/reaction.nix
index 0572913e3bc0..1edf4bcc698d 100644
--- a/nixos/modules/services/security/reaction.nix
+++ b/nixos/modules/services/security/reaction.nix
@@ -17,7 +17,6 @@ in
 {
   options.services.reaction = {
     enable = mkEnableOption "enable reaction";
-
     package = mkPackageOption pkgs "reaction" { };
 
     settings = mkOption {
@@ -102,8 +101,14 @@ in
         {
           # allows reading journal logs of processess
           users.users.reaction.extraGroups = [ "systemd-journal" ];
+
           # allows modifying ip firewall rules
-          systemd.services.reaction.AmbientCapabilities = [ "CAP_NET_ADMIN" ];
+          systemd.services.reaction.unitConfig.ConditionCapability = "CAP_NET_ADMIN";
+          systemd.services.reaction.serviceConfig = {
+            CapabilityBoundingSet = [ "CAP_NET_ADMIN" ];
+            AmbientCapabilities = [ "CAP_NET_ADMIN" ];
+          };
+
           # optional, if more control over ssh logs is needed
           services.openssh.settings.LogLevel = lib.mkDefault "VERBOSE";
         }
@@ -117,19 +122,14 @@ in
       cfg = config.services.reaction;
 
       generatedSettings = settingsFormat.generate "reaction.yml" cfg.settings;
-      namedGeneratedSettings = lib.optional (cfg.settings != { }) {
-        name = "reaction.yml";
-        path = generatedSettings;
-      };
-
-      # SAFETY: We can discard the dependencies of "file" in the name attribute because we keep them in the path attribute
-      # See https://nix.dev/manual/nix/2.32/language/string-context
-      namedSettingsFiles = builtins.map (file: {
-        name = builtins.unsafeDiscardStringContext (builtins.baseNameOf file);
-        path = file;
-      }) cfg.settingsFiles;
-
-      settingsDir = pkgs.linkFarm "reaction.d" (namedSettingsFiles ++ namedGeneratedSettings);
+      settingsDir = pkgs.runCommand "reaction-settings-dir" { } ''
+        mkdir -p $out
+        ${lib.concatMapStringsSep "\n" (file: ''
+          filename=$(basename "${file}")
+          ln -s "${file}" "$out/$filename"
+        '') cfg.settingsFiles}
+        ln -s ${generatedSettings} $out/reaction.yml
+      '';
     in
     lib.mkIf cfg.enable {
       assertions = [
@@ -157,18 +157,12 @@ in
             ''
           );
 
-      # Easier to debug conf when we have direct access to it,
-      # rather than having to look for it in the systemd service file.
-      environment.etc."reaction".source = settingsDir;
-
       systemd.services.reaction = {
-        enable = true;
         description = "Scan logs and take action";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
         partOf = lib.optionals cfg.stopForFirewall [ "firewall.service" ];
         path = [ pkgs.iptables ];
-        unitConfig.ConditionCapability = "CAP_NET_ADMIN";
         serviceConfig = {
           Type = "simple";
           User = if (!cfg.runAsRoot) then "reaction" else "root";
@@ -177,11 +171,29 @@ in
               lib.optionalString (cfg.loglevel != null) " -l ${cfg.loglevel}"
             }
           '';
-          StateDirectory = "reaction";
-          RuntimeDirectory = "reaction";
-          WorkingDirectory = "/var/lib/reaction";
 
-          CapabilityBoundingSet = [ "CAP_NET_ADMIN" ];
+          NoNewPrivileges = true;
+
+          RuntimeDirectory = "reaction";
+          RuntimeDirectoryMode = "0750";
+          WorkingDirectory = "%S/reaction";
+          StateDirectory = "reaction";
+          StateDirectoryMode = "0750";
+          LogsDirectory = "reaction";
+          LogsDirectoryMode = "0750";
+          UMask = 0077;
+
+          RemoveIPC = true;
+          PrivateTmp = true;
+          ProtectHome = true;
+          ProtectClock = true;
+          PrivateDevices = true;
+          ProtectHostname = true;
+          ProtectSystem = "strict";
+          ProtectKernelTunables = true;
+          ProtectKernelModules = true;
+          ProtectControlGroups = true;
+          ProtectKernelLogs = true;
         };
       };
 
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index dc1ec27c967f..9029a0e8e0cb 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -421,7 +421,7 @@ in
       # this file is expected in /etc/qemu and not sysconfdir (/var/lib)
       etc."qemu/bridge.conf".text = lib.concatMapStringsSep "\n" (e: "allow ${e}") cfg.allowedBridges;
       systemPackages = with pkgs; [
-        libressl.nc
+        netcat
         config.networking.firewall.package
         cfg.package
         cfg.qemu.package
diff --git a/nixos/tests/ceph-multi-node.nix b/nixos/tests/ceph-multi-node.nix
index 1c1077595d2a..7aaf31c14d3e 100644
--- a/nixos/tests/ceph-multi-node.nix
+++ b/nixos/tests/ceph-multi-node.nix
@@ -53,7 +53,7 @@ let
         sudo
         ceph
         xfsprogs
-        libressl.nc
+        netcat
       ];
 
       boot.kernelModules = [ "xfs" ];
diff --git a/nixos/tests/facter/facter.json b/nixos/tests/facter/facter.json
index 37d6ba87c14d..5a6cf464dfec 100644
--- a/nixos/tests/facter/facter.json
+++ b/nixos/tests/facter/facter.json
@@ -14,6 +14,18 @@
         "model": 33
       }
     ],
+    "graphics_card": [
+      {
+        "driver_modules": [
+          "i915"
+        ]
+      }
+    ],
+    "monitor": [
+      {
+        "model": "Test Monitor"
+      }
+    ],
     "system": {
       "form_factor": "desktop"
     }
diff --git a/nixos/tests/fail2ban.nix b/nixos/tests/fail2ban.nix
index 43acfa54cf7a..97e5b4edaeab 100644
--- a/nixos/tests/fail2ban.nix
+++ b/nixos/tests/fail2ban.nix
@@ -14,7 +14,7 @@
   nodes.client = _: {
     environment.systemPackages = [
       pkgs.sshpass
-      pkgs.libressl.nc
+      pkgs.netcat
     ];
 
   };
diff --git a/nixos/tests/jool.nix b/nixos/tests/jool.nix
index 3bbfc9469011..76076cba6a63 100644
--- a/nixos/tests/jool.nix
+++ b/nixos/tests/jool.nix
@@ -24,7 +24,7 @@ let
           printf 'HTTP/1.0 200 OK\n'
           printf 'Content-Length: ${toString (1 + builtins.stringLength msg)}\n'
           printf '\n${msg}\n\n'
-        } | ${pkgs.libressl.nc}/bin/nc -${toString ip}nvl 80
+        } | ${pkgs.netcat}/bin/nc -${toString ip}nvl 80
         done
       '';
     };
diff --git a/nixos/tests/reaction-firewall.nix b/nixos/tests/reaction-firewall.nix
index 7efea1ad4ae0..a3d46cbfda8d 100644
--- a/nixos/tests/reaction-firewall.nix
+++ b/nixos/tests/reaction-firewall.nix
@@ -24,44 +24,44 @@
   testScript = # py
     ''
       start_all()
-      machine.wait_for_unit("multi-user.target")
 
-      # Verify both services start successfully
+      machine.wait_for_unit("multi-user.target")
       machine.wait_for_unit("firewall.service")
       machine.wait_for_unit("reaction.service")
 
-      # Check reaction chain exists in iptables
-      output = machine.succeed("iptables -w -L -n")
-      assert "reaction" in output, "reaction chain not found in iptables"
+      def check_reaction_in_iptables(context = ""):
+        with subtest("check reaction chain exists"):
+          machine.sleep(3)
+          output = machine.succeed("iptables -nvL")
+          assert "reaction" in output, f"error: reaction chain missing in iptables, {context}"
 
-      # Reload firewall and verify there's no issues due to reaction chain
-      machine.succeed("systemctl reload firewall")
-      output = machine.succeed("journalctl -u reaction.service -u firewall.service --no-pager")
-      assert "ERROR" not in output, "firewall reload failed due to reaction"
+      check_reaction_in_iptables()
 
-      # Verify reaction chain still exists after reload
-      output = machine.succeed("iptables -w -L -n")
-      assert "reaction" in output, "reaction chain missing after firewall reload"
+      with subtest("reload firewall"):
+        machine.succeed("systemctl reload firewall")
+        output = machine.succeed("journalctl -u firewall.service --no-pager")
+        assert "ERROR" not in output, "firewall reload failed due to reaction"
 
-      # Restart firewall and verify reaction restarts as well
-      machine.succeed("systemctl restart firewall")
-      output = machine.succeed("journalctl -u reaction.service -u firewall.service --no-pager")
-      assert "INFO stop command" in output and "INFO start command" in output, "reaction did not restart when firewall was restarted"
+        check_reaction_in_iptables(context="after firewall reload")
 
-      output = machine.succeed("iptables -w -L -n")
-      assert "reaction" in output, "reaction chain missing after firewall restart"
+      with subtest("restart firewall"):
+        machine.succeed("systemctl restart firewall")
+        output = machine.succeed("journalctl -u reaction.service --no-pager")
+        assert "INFO stop command" in output and "INFO start command" in output, "reaction did not restart when firewall was restarted"
 
-      # Stop reaction manually and verify chains are cleaned up
-      machine.succeed("systemctl stop reaction")
-      output = machine.succeed("iptables -w -L -n || true")
-      assert "reaction" not in output, "reaction chain still exists after stop"
+        check_reaction_in_iptables(context="after firewall restart")
 
-      # Start reaction again and verify it works
-      machine.succeed("systemctl start reaction")
-      machine.wait_for_unit("reaction.service")
+      with subtest("stop reaction manually and verify chains are cleaned up"):
+        machine.succeed("systemctl stop reaction")
+        machine.sleep(3)
+        output = machine.succeed("iptables -nvL")
+        assert "reaction" not in output, "reaction chain still exists after the service was stopped"
 
-      output = machine.succeed("iptables -w -L -n")
-      assert "reaction" in output, "reaction chain not recreated"
+        with subtest("start reaction again and verify it works"):
+          machine.succeed("systemctl start reaction")
+          machine.wait_for_unit("reaction.service")
+
+          check_reaction_in_iptables()
     '';
 
   # Debug interactively with:
diff --git a/nixos/tests/reaction.nix b/nixos/tests/reaction.nix
index af743caa1260..730c230e4226 100644
--- a/nixos/tests/reaction.nix
+++ b/nixos/tests/reaction.nix
@@ -10,18 +10,22 @@
     services.reaction = {
       enable = true;
       stopForFirewall = false;
-      settingsFiles = [
-        "${pkgs.reaction}/share/examples/example.jsonnet"
-        # "${pkgs.reaction}/share/examples/example.yml" # can't specify both because conflicts
-      ];
+      # example.jsonnet/example.yml can be copied and modified from ${pkgs.reaction}/share/examples
+      settingsFiles = [ "${pkgs.reaction}/share/examples/example.jsonnet" ];
       runAsRoot = false;
     };
     services.openssh.enable = true;
+    # If not running as root you need to give the reaction user and service the proper permissions
 
-    # required to access journal of sshd.service as runAsRoot = false
+    # allows reading journal logs of processess
     users.users.reaction.extraGroups = [ "systemd-journal" ];
-    # required for allowing reaction to modifiy firewall rules
-    systemd.services.reaction.serviceConfig.AmbientCapabilities = [ "CAP_NET_ADMIN" ];
+
+    # allows modifying ip firewall rules
+    systemd.services.reaction.unitConfig.ConditionCapability = "CAP_NET_ADMIN";
+    systemd.services.reaction.serviceConfig = {
+      CapabilityBoundingSet = [ "CAP_NET_ADMIN" ];
+      AmbientCapabilities = [ "CAP_NET_ADMIN" ];
+    };
 
     users.users.nixos.isNormalUser = true; # neeeded to establish a ssh connection, by default root login is succeeding without any password
   };
@@ -42,7 +46,6 @@
       server.wait_for_unit("multi-user.target")
       server.wait_for_unit("reaction")
       server.wait_for_unit("sshd")
-      client.wait_for_unit("multi-user.target")
 
       client_addr = "${(lib.head nodes.client.networking.interfaces.eth1.ipv4.addresses).address}"
       server_addr = "${(lib.head nodes.server.networking.interfaces.eth1.ipv4.addresses).address}"
diff --git a/nixos/tests/samba-wsdd.nix b/nixos/tests/samba-wsdd.nix
index 07ad7d68f664..3277a8b0e6c8 100644
--- a/nixos/tests/samba-wsdd.nix
+++ b/nixos/tests/samba-wsdd.nix
@@ -40,7 +40,7 @@
     server_wsdd.wait_for_unit("samba-wsdd")
 
     client_wsdd.wait_until_succeeds(
-        "echo list | ${pkgs.libressl.nc}/bin/nc -N -U /run/wsdd/wsdd.sock | grep -i SERVER-WSDD"
+        "echo list | ${pkgs.netcat}/bin/nc -N -U /run/wsdd/wsdd.sock | grep -i SERVER-WSDD"
     )
   '';
 }
diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 02b7d2fb8317..22af4b55c4f7 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.0.70";
-    hash = "sha256-ed2oYB6G9EuSRqgt18W69JS73+uf6vqXtwQ1ZY+eWy8=";
+    version = "2.0.72";
+    hash = "sha256-nfzcm8lEtZl3vD129rtpV4Oc5vKW7SKyZHfFg1jd8hU=";
   };
 
   meta = {
diff --git a/pkgs/applications/misc/resp-app/default.nix b/pkgs/applications/misc/resp-app/default.nix
deleted file mode 100644
index 6bff5a503556..000000000000
--- a/pkgs/applications/misc/resp-app/default.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  fetchFromGitHub,
-  fetchpatch,
-  brotli,
-  lz4,
-  pyotherside,
-  python3,
-  python3Packages,
-  qtbase,
-  qtcharts,
-  qmake,
-  qttools,
-  rdbtools,
-  snappy,
-  wrapQtAppsHook,
-  zstd,
-}:
-
-let
-  rdbtools-patched = rdbtools.overridePythonAttrs (oldAttrs: {
-    # Add required additional flag for resp-app
-    patches = oldAttrs.patches or [ ] ++ [
-      (fetchpatch {
-        name = "Add-flag-to-parse-only-key-names.patch";
-        url = "https://github.com/uglide/redis-rdb-tools/commit/b74946e6fbca589947ef0186429d5ce45a074b87.patch";
-        hash = "sha256-1gjqB/IDSsAbrwzWSezlAW/2SYr6BFm1QJ2HAHK2fFs=";
-      })
-    ];
-  });
-in
-mkDerivation rec {
-  pname = "RESP.app";
-  version = "2022.5";
-
-  src = fetchFromGitHub {
-    owner = "RedisInsight";
-    repo = "RedisDesktopManager";
-    fetchSubmodules = true;
-    rev = version;
-    hash = "sha256-5eI3J2RsYE5Ejb1r8YkgzmGX2FyaCLFD0lc10J+fOT4=";
-  };
-
-  nativeBuildInputs = [
-    python3Packages.wrapPython
-    qmake
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    brotli
-    lz4
-    pyotherside
-    python3
-    qtbase
-    qtcharts
-    qttools
-    snappy
-    zstd
-  ]
-  ++ pythonPath;
-
-  pythonPath = with python3Packages; [
-    bitstring
-    cbor
-    msgpack
-    phpserialize
-    rdbtools-patched
-    python-lzf
-  ];
-
-  postPatch = ''
-    substituteInPlace src/resp.pro \
-      --replace 'which ccache' "false" \
-      --replace 'target.files = $$DESTDIR/resp' "${placeholder "src"}/bin/linux/release/resp" \
-      --replace '/opt/resp_app' "${placeholder "out"}" \
-      --replace 'target.path = $$LINUX_INSTALL_PATH' 'target.path = $$LINUX_INSTALL_PATH/bin' \
-      --replace '/usr/' "$out/"
-    rm -r 3rdparty/snappy
-  '';
-
-  qmakeFlags = [
-    "SYSTEM_LZ4=1"
-    "SYSTEM_ZSTD=1"
-    "SYSTEM_SNAPPY=1"
-    "SYSTEM_BROTLI=1"
-    "VERSION=${version}"
-    "src/resp.pro"
-  ];
-
-  preFixup = ''
-    buildPythonPath "$pythonPath"
-    qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
-  '';
-
-  meta = {
-    description = "Cross-platform Developer GUI for Redis";
-    mainProgram = "resp";
-    homepage = "https://resp.app/";
-    license = lib.licenses.gpl3Only;
-    platforms = lib.platforms.linux;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index c4ec5d483532..677226bac978 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "143.0.7499.109",
+    "version": "143.0.7499.146",
     "chromedriver": {
-      "version": "143.0.7499.110",
-      "hash_darwin": "sha256-Yvq29D71/S1wlnG+7Dcd4IYuOcdSwxHSKLfdtitnmyQ=",
-      "hash_darwin_aarch64": "sha256-adwfK1Iymjla6lSID08SyEqbnYjJLKfB92Yrh5/9LuQ="
+      "version": "143.0.7499.147",
+      "hash_darwin": "sha256-bsyTxvmiIDdV/ivUjbLk3K+Ve03DvVZG3HF/y4X9JUU=",
+      "hash_darwin_aarch64": "sha256-j5PbvqUsR+XlYZU7xB2MTPJncfSgCIy9tE298ww8Ux4="
     },
     "deps": {
       "depot_tools": {
@@ -21,8 +21,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "71a0dbd6672e2ccb6d1008376cbb7acd315cb8d6",
-        "hash": "sha256-K7HzC+M7WIMsyB4Wuy04WvGAX+QsTN5daOhkox1wxnA=",
+        "rev": "c1224fc40c96e7f17f0cdeb87a8f4c64b93c0d74",
+        "hash": "sha256-Sn4j7vs7g/D9GnL+BMCyg73iEeGn7Miq0k42mV6Z3hM=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -132,8 +132,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "e1ce227ebf75378c5f60a9d531579982bcdd93ee",
-        "hash": "sha256-RqGCh/InZagPemqMRnR/ziaxDm3ruS4dtnj87mBmIjc="
+        "rev": "479f62d2194fd6e44c37d07654ca6e41c42bd332",
+        "hash": "sha256-rzZn9l0EFcir6k8Xv2svIrhRPwe/rq48H7CX/3yfgFE="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -777,8 +777,8 @@
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "1788a81407183acc98163a4e1507c5c63fb175cc",
-        "hash": "sha256-7FIcH5MG7kNHmN2FE00Qyd1NlfYzb1xKmVDX7MCNyXQ="
+        "rev": "4e31d1a1ff41bb1b79609c83f998458a111a149c",
+        "hash": "sha256-3tfB6jNsTLYozYqBfAmYNmq94wQ3OFxBSlOfRaj6wxc="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -807,8 +807,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "beee9f5cafde91bbd086077a11db16cb9768e62a",
-        "hash": "sha256-q1gVbNGls2izSDb3KZmteZQvcc6M0JyPuZFPfG4FIAs="
+        "rev": "326f5f8cad3f0e436c8ea8f82a6894936a32e860",
+        "hash": "sha256-crTEZnN5iWTXOxpAkvIDPQ6hyfF54F1/ImoKrdmO2K4="
       }
     }
   },
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a3a64785c26d..a495cea26ddb 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -318,13 +318,13 @@
     "vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE="
   },
   "dnsimple_dnsimple": {
-    "hash": "sha256-Zx4M0TKamyfm5Z5EAtiHWQQTNX/VT0EkAaHM7x/2SGk=",
+    "hash": "sha256-zPvHTSmptdm5w28rpgmwrYBIo+0Y077wZ+FNKbKHaT4=",
     "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple",
     "owner": "dnsimple",
     "repo": "terraform-provider-dnsimple",
-    "rev": "v1.10.0",
+    "rev": "v2.0.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-M6Z/wMOKhQncuHAhkSPfWT77b14lIZ/sVQT7DmM60FI="
+    "vendorHash": "sha256-DRMbcAR+DDrxrg1jNgnoWUg+OjlKm7wkqgIN6Hhkp3U="
   },
   "dnsmadeeasy_dme": {
     "hash": "sha256-JH9YcM9Fvd1x0BJpLUZCm6a9hZZxySrkFVLP89FO3fU=",
@@ -714,13 +714,13 @@
     "vendorHash": null
   },
   "ibm-cloud_ibm": {
-    "hash": "sha256-S1Azsq42GEqgpqVB3Wpi6EJAL8x+s+i+oTJFPQCVfeI=",
+    "hash": "sha256-xiiQKp4ZBLAR1OM31D8UWJbaZ2SkzrBIr3uW3N3iSZg=",
     "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
     "owner": "IBM-Cloud",
     "repo": "terraform-provider-ibm",
-    "rev": "v1.86.0",
+    "rev": "v1.86.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-IDv2L1fFqhbThc3kO6UNM+6hRJ+DZkT7voc/m3c5BCA="
+    "vendorHash": "sha256-vHgeVhZV9JLH2vXwFUO0N8xp8BLBPk7ypK+kkWwtbTk="
   },
   "icinga_icinga2": {
     "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
@@ -1174,13 +1174,13 @@
     "vendorHash": "sha256-f3b4NULINH8XworCn46fiz4GmBM31ROdAJy1j4GKkx4="
   },
   "scaleway_scaleway": {
-    "hash": "sha256-V0mR72RJa+DgWZxnvSCWI6HwZpqewbHT5FKLdSiwGw4=",
+    "hash": "sha256-LR1e8gAF8htYpxfj/m/Ge266sFRFc8tijaE/9uKYYBw=",
     "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
     "owner": "scaleway",
     "repo": "terraform-provider-scaleway",
-    "rev": "v2.64.0",
+    "rev": "v2.65.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Z9EKIWBkmKptQMJFRh5SK2hhKwh5z5Lij0ZwXChOarY="
+    "vendorHash": "sha256-HWAaBgKD/viiFaxvyHE4BuWdsY0tCSQFaf8YJq4PS/0="
   },
   "scottwinkler_shell": {
     "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 0ecca50b4bad..839899a9d760 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -194,8 +194,8 @@ rec {
   mkTerraform = attrs: pluggable (generic attrs);
 
   terraform_1 = mkTerraform {
-    version = "1.14.2";
-    hash = "sha256-gYJW31cDsfs/SLBE9InZP1ghG6gbat2pkrmHLIAZVDY=";
+    version = "1.14.3";
+    hash = "sha256-QPVKWtpm67z13hmPgM/YXm+CBOqiI8qZwttx2h6LboU=";
     vendorHash = "sha256-NDtBLa8vokrSRDCNX10lQyfMDzTrodoEj5zbDanL4bk=";
     patches = [ ./provider-path-0_15.patch ];
     passthru = {
diff --git a/pkgs/applications/window-managers/i3/kitti3.nix b/pkgs/applications/window-managers/i3/kitti3.nix
index 846e1847ecf9..50e71aa49edd 100644
--- a/pkgs/applications/window-managers/i3/kitti3.nix
+++ b/pkgs/applications/window-managers/i3/kitti3.nix
@@ -1,15 +1,16 @@
 {
   buildPythonApplication,
   fetchFromGitHub,
-  poetry-core,
   i3ipc,
   lib,
+  poetry-core,
+  writeScript,
 }:
 
-buildPythonApplication {
+buildPythonApplication rec {
   pname = "kitti3";
-  version = "unstable-2021-09-11";
-  format = "pyproject";
+  version = "0.5.1-unstable-2021-09-10";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "LandingEllipse";
@@ -32,6 +33,25 @@ buildPythonApplication {
     i3ipc
   ];
 
+  passthru.updateScript = writeScript "update-kitti3" ''
+    #!/usr/bin/env nix-shell
+    #!nix-shell -i bash -p git common-updater-scripts perl tomlq
+    tmpdir="$(mktemp -d)"
+    trap "rm -rf $tmpdir" EXIT
+    git clone --depth=1 "${src.gitRepoUrl}" "$tmpdir"
+    pushd "$tmpdir"
+    newVersionNumber=$(perl -ne 'print if s/version = "([\d.]+)"/$1/' pyproject.toml)
+    newRevision=$(git show -s --pretty='format:%H')
+    newDate=$(git show -s --pretty='format:%cs')
+    newVersion="$newVersionNumber-unstable-$newDate"
+    echo "newVersion = $newVersion" >&2
+    echo "newRevision = $newRevision" >&2
+    popd
+    update-source-version --rev="$newRevision" "kitti3" "$newVersion"
+    perl -pe 's/^(.*version = ")([\d\.]+)(.*)$/''${1}'"''${newVersion}"'";/' \
+      -i 'pkgs/applications/window-managers/i3/kitti3.nix'
+  '';
+
   meta = {
     homepage = "https://github.com/LandingEllipse/kitti3";
     description = "Kitty drop-down service for sway & i3wm";
diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix
index 298e7313c18e..e4dc887abb0e 100644
--- a/pkgs/by-name/an/anytype-heart/package.nix
+++ b/pkgs/by-name/an/anytype-heart/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
 
   # Use only versions specified in anytype-ts middleware.version file:
   #  https://github.com/anyproto/anytype-ts/blob/v<anytype-ts-version>/middleware.version
-  version = "0.44.5";
+  version = "0.46.3";
 
   # Update only together with 'anytype' package.
   # nixpkgs-update: no auto update
@@ -34,10 +34,10 @@ buildGoModule (finalAttrs: {
     owner = "anyproto";
     repo = "anytype-heart";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wSZcDcGPKbtUWf7hYXiQrS8a4sgnbItW7bu4hxQ2yFM=";
+    hash = "sha256-g3YAi7T6E0o2xjCpmnwmKUugEKyziJIYRaPU4dQH9xw=";
   };
 
-  vendorHash = "sha256-T7CPD6mbxkN1x53oe9jsS2XMqluqWv8VPPd1pnXZvlc=";
+  vendorHash = "sha256-s/otpfRwXFUOek8oVr5eUcKH4Vwd5BbtB0GH+hjzjwI=";
 
   subPackages = [ "cmd/grpcserver" ];
   tags = [
diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index 5b132cc39318..1ce8a701df4d 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   anytype-heart,
   libsecret,
-  electron_37,
+  electron,
   makeDesktopItem,
   copyDesktopItems,
   commandLineArgs ? "",
@@ -14,23 +14,23 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "anytype";
-  version = "0.50.5";
+  version = "0.52.4";
 
   src = fetchFromGitHub {
     owner = "anyproto";
     repo = "anytype-ts";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HLYYuMtgvF0UHHnThEWSpLIZEvLxNrOtkoXEhSAT24A=";
+    hash = "sha256-4R0ROpMH49BrUcjd9Xcgs7wRo1flMg7kEsZS51uL5nE=";
   };
 
   locales = fetchFromGitHub {
     owner = "anyproto";
     repo = "l10n-anytype-ts";
-    rev = "aaa83aae39a7dbf59c3c8580be4700edf7481893";
-    hash = "sha256-MOR7peovTYYQR96lOoxyETY0aOH6KcB9vXCqpXKxI/4=";
+    rev = "910cbb5b05cc390e53205fe275768166c946c041";
+    hash = "sha256-H6f/3paRKJd/GdZBJt0IHLbaGbbXpsbqjvDPu628JGE=";
   };
 
-  npmDepsHash = "sha256-ohlHY7zw+GyaNuwI2t7dQj1bQkXH//LiyiHyi2B+/9I=";
+  npmDepsHash = "sha256-k6iAWWbLmKSoqvWFyd//zlNy/LrdD77qlngL9QeP+nw=";
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@@ -44,7 +44,7 @@ buildNpmPackage (finalAttrs: {
 
   npmFlags = [
     # keytar needs to be built against electron's ABI
-    "--nodedir=${electron_37.headers}"
+    "--nodedir=${electron.headers}"
   ];
 
   patches = [
@@ -87,7 +87,7 @@ buildNpmPackage (finalAttrs: {
 
     cp LICENSE.md $out/share
 
-    makeWrapper '${lib.getExe electron_37}' $out/bin/anytype \
+    makeWrapper '${lib.getExe electron}' $out/bin/anytype \
       --set-default ELECTRON_IS_DEV 0 \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
       --add-flags $out/lib/anytype/ \
diff --git a/pkgs/by-name/aw/aws-lc/package.nix b/pkgs/by-name/aw/aws-lc/package.nix
index 1207ea2eb15e..c267a1335ca2 100644
--- a/pkgs/by-name/aw/aws-lc/package.nix
+++ b/pkgs/by-name/aw/aws-lc/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "aws-lc";
-  version = "1.65.0";
+  version = "1.66.0";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-lc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-rpxEhOy9qYwIDa78u1BOgANfnkfGgGacKOjjlqXtn88=";
+    hash = "sha256-OO9TWwaV/GlyrLl4C6oCFxIAeYfWjzvY7o//7OuoRDc=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/ba/bazel_7/package.nix b/pkgs/by-name/ba/bazel_7/package.nix
index d8c7ea384e90..a30d5ad78086 100644
--- a/pkgs/by-name/ba/bazel_7/package.nix
+++ b/pkgs/by-name/ba/bazel_7/package.nix
@@ -431,6 +431,11 @@ stdenv.mkDerivation rec {
           sedVerbose $wrapper \
             -e "s,/usr/bin/xcrun install_name_tool,${cctools}/bin/install_name_tool,g"
         done
+
+        # set --macos_sdk_version to make utimensat visible:
+        sedVerbose compile.sh \
+          -e "/bazel_build /a\  --macos_sdk_version=${stdenv.hostPlatform.darwinMinVersion} \\\\" \
+
       '';
 
       genericPatches = ''
diff --git a/pkgs/by-name/be/bella/package.nix b/pkgs/by-name/be/bella/package.nix
index ce363020da48..6c16009b3eb9 100644
--- a/pkgs/by-name/be/bella/package.nix
+++ b/pkgs/by-name/be/bella/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bella";
-  version = "0.1.3";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "josephmawa";
     repo = "Bella";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JSzgh56Ph8LjVY2uPfu1tacdr7BBbBzRfdWtcTRga7I=";
+    hash = "sha256-ePzDnaoGPa5Hku7Rpced989QB6uOXN/jfXgTwtlE7rQ=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix
index 07db3178fb0a..a4dbb8b53717 100644
--- a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix
+++ b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix
@@ -14,7 +14,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "blackmagic-desktop-video";
-  version = "15.3";
+  version = "15.3.1";
 
   buildInputs = [
     autoPatchelfHook
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
       {
         outputHashMode = "recursive";
         outputHashAlgo = "sha256";
-        outputHash = "sha256-QcM/FTEYkG1Zteb2TNysQjP/mNS1B2Wa8rqkJ70m24s=";
+        outputHash = "sha256-4Y7bmN08fZ9hRsyFKP4cfGb4fggLY9bdm32+UTIGiTs=";
 
         impureEnvVars = lib.fetchers.proxyImpureEnvVars;
 
diff --git a/pkgs/by-name/bu/buildkit/package.nix b/pkgs/by-name/bu/buildkit/package.nix
index 3083d73a0557..7af50aac8eae 100644
--- a/pkgs/by-name/bu/buildkit/package.nix
+++ b/pkgs/by-name/bu/buildkit/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "buildkit";
-  version = "0.26.2";
+  version = "0.26.3";
 
   src = fetchFromGitHub {
     owner = "moby";
     repo = "buildkit";
     rev = "v${version}";
-    hash = "sha256-AMsql+b5yUnkw6KkJte2qjN+MadJn06/0HohXP4N47c=";
+    hash = "sha256-2Utxan85hHmyt+7anfbjFxBHhKzmZb7k9K025vA76Ys=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/ca/cavasik/package.nix b/pkgs/by-name/ca/cavasik/package.nix
new file mode 100644
index 000000000000..6b28bd7753bb
--- /dev/null
+++ b/pkgs/by-name/ca/cavasik/package.nix
@@ -0,0 +1,83 @@
+{
+  cava,
+  desktop-file-utils,
+  fetchFromGitHub,
+  gobject-introspection,
+  gst_all_1,
+  gtk4,
+  lib,
+  libadwaita,
+  meson,
+  ninja,
+  nix-update-script,
+  pkg-config,
+  python3Packages,
+  wrapGAppsHook4,
+}:
+
+let
+  pname = "cavasik";
+  version = "3.2.0";
+in
+python3Packages.buildPythonApplication {
+  inherit pname version;
+
+  pyproject = false; # Built with meson
+
+  src = fetchFromGitHub {
+    owner = "TheWisker";
+    repo = "Cavasik";
+    tag = "v${version}";
+    hash = "sha256-O8rFtqzmDktXKF3219RAo1yxqjfPm1qkHhAyoT7N8AU=";
+  };
+
+  postPatch = ''
+    substituteInPlace src/cava.py \
+      --replace-fail '"cava"' '"${lib.getExe cava}"'
+  '';
+
+  nativeBuildInputs = [
+    desktop-file-utils
+    gobject-introspection
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    gst_all_1.gstreamer
+    gtk4
+    libadwaita
+  ];
+
+  dependencies = with python3Packages; [
+    pycairo
+    pydbus
+    pygobject3
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    meson test --print-errorlog
+
+    runHook postCheck
+  '';
+
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=(''${gappsWrapperArgs[@]})
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Audio visualizer based on CAVA with extended capabilities";
+    mainProgram = "cavasik";
+    homepage = "https://github.com/TheWisker/Cavasik";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ starryreverie ];
+  };
+}
diff --git a/pkgs/by-name/ce/cerberus/package.nix b/pkgs/by-name/ce/cerberus/package.nix
index 6e588d63d961..f7eaddb31a2f 100644
--- a/pkgs/by-name/ce/cerberus/package.nix
+++ b/pkgs/by-name/ce/cerberus/package.nix
@@ -10,15 +10,15 @@
   testers,
   cerberus,
 }:
-ocamlPackages.buildDunePackage rec {
+ocamlPackages.buildDunePackage (finalAttrs: {
   pname = "cerberus";
-  version = "0-unstable-2025-11-26";
+  version = "0-unstable-2025-12-15";
 
   src = fetchFromGitHub {
     owner = "rems-project";
     repo = "cerberus";
-    rev = "6d60ef25944ebcdab892158c949a8e05501557dc";
-    hash = "sha256-RucW01xuW5b6F9/O1OL99YJn3rSMCP7l7Cwjuv4PNIc=";
+    rev = "50621977ba282ac527e9259f7e9334d2c5bef41c";
+    hash = "sha256-CAZeLG1M9oBzl/5EsIYwyV3St5fdwmfkPApACbsIYAc=";
   };
 
   patches = [
@@ -35,7 +35,7 @@ ocamlPackages.buildDunePackage rec {
   # our version since git is impure
   postPatch = ''
     substituteInPlace tools/gen_version.ml \
-      --replace-fail '"unknown"' '"${version}"'
+      --replace-fail '"unknown"' '"${finalAttrs.version}"'
   '';
 
   minimalOCamlVersion = "4.12";
@@ -136,4 +136,4 @@ ocamlPackages.buildDunePackage rec {
     ];
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/ci/cinnamon-desktop/package.nix b/pkgs/by-name/ci/cinnamon-desktop/package.nix
index 9c701219bafb..2a7f908e50d5 100644
--- a/pkgs/by-name/ci/cinnamon-desktop/package.nix
+++ b/pkgs/by-name/ci/cinnamon-desktop/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-desktop";
-  version = "6.6.0";
+  version = "6.6.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-desktop";
     tag = version;
-    hash = "sha256-9qgt+E5qbzq+x9fJKkoSBFgA96HBDLysQvg6b04WbMU=";
+    hash = "sha256-vBRaUXsPAPOpMEs2pl6AaaKIMeeXB0UdCb1hzYd43KY=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/ci/cinnamon-screensaver/package.nix b/pkgs/by-name/ci/cinnamon-screensaver/package.nix
index 4f02353c48c3..57f16731c8bf 100644
--- a/pkgs/by-name/ci/cinnamon-screensaver/package.nix
+++ b/pkgs/by-name/ci/cinnamon-screensaver/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-screensaver";
-  version = "6.6.0";
+  version = "6.6.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-screensaver";
     tag = version;
-    hash = "sha256-Jo9GRsiPvqGZ2ITaewV5H4VMc5EotTTXIaqzXwDA+Z4=";
+    hash = "sha256-NK33cIrcTicLs59eJ550FghjuWS93yD642ObAS55Dtk=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ci/cinnamon/package.nix b/pkgs/by-name/ci/cinnamon/package.nix
index f51bd9f4fb16..27688bf852e5 100644
--- a/pkgs/by-name/ci/cinnamon/package.nix
+++ b/pkgs/by-name/ci/cinnamon/package.nix
@@ -74,13 +74,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cinnamon";
-  version = "6.6.0";
+  version = "6.6.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon";
     tag = version;
-    hash = "sha256-DiAc1Ng03xzNYYpf79g9p338syPScKftmviNw6Y5i5o=";
+    hash = "sha256-evjXa42mo7wkLh5HDax+2Tsc/x/oG3tPHU1tczoxmJU=";
   };
 
   patches = [
diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index be9c57349c13..e9f4863a8962 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.0.70",
+  "version": "2.0.71",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.70",
+      "version": "2.0.71",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 5051f101efae..36bf5792f78e 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -11,14 +11,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.0.70";
+  version = "2.0.71";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-RTMhrFhbamO8Ow5iKd3IiLoKoLF5cz279ArjPZymE9o=";
+    hash = "sha256-krbaIy1KfmbwroQRZpGR6bOYNc2l/GZKjhavmiwVCms=";
   };
 
-  npmDepsHash = "sha256-coTUQVOOT/jonVtnmY/zenv1PI93JFlpFEqlUlhssJM=";
+  npmDepsHash = "sha256-cio+ZkVIPIkxRXXQzwFYXr08OUEBVJpRjtvmJLcH3Ag=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json
diff --git a/pkgs/by-name/cl/clojure-lsp/package.nix b/pkgs/by-name/cl/clojure-lsp/package.nix
index 00bc09a9ea95..3ae353c04a75 100644
--- a/pkgs/by-name/cl/clojure-lsp/package.nix
+++ b/pkgs/by-name/cl/clojure-lsp/package.nix
@@ -12,11 +12,11 @@
 
 buildGraalvmNativeImage (finalAttrs: {
   pname = "clojure-lsp";
-  version = "2025.08.25-14.21.46";
+  version = "2025.11.28-12.47.43";
 
   src = fetchurl {
     url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${finalAttrs.version}/clojure-lsp-standalone.jar";
-    hash = "sha256-J89RHgxLJHSRQfbSLT0MhX7kDMsZEWjK8RGGIyx6dik=";
+    hash = "sha256-An7sTudpP2Ct32sYShNhgRsHgJJIN9H+sR5MlQ8i+7o=";
   };
 
   extraNativeImageBuildArgs = [
diff --git a/pkgs/by-name/da/davis/package.nix b/pkgs/by-name/da/davis/package.nix
index 91fb72806781..26b24ee51bfa 100644
--- a/pkgs/by-name/da/davis/package.nix
+++ b/pkgs/by-name/da/davis/package.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "davis";
-  version = "5.2.0";
+  version = "5.3.0";
 
   src = fetchFromGitHub {
     owner = "tchapi";
     repo = "davis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ih06CKwgR2ljw3w9YfgVUdBCjt5Nbs34fMsErRUkfcc=";
+    hash = "sha256-okysA35sdtvbyn90fqGbhGr2yWYAw1DBJYBBhPep6T0=";
   };
 
-  vendorHash = "sha256-e0qSI5naqM/mUSMduiku0yQkYMGw1y9Uwa5oYlxaDzs=";
+  vendorHash = "sha256-j28IsT7tdTg7+M8KwBa1LDWw0YGgv9EGnaCQNeTJZyw=";
 
   composerNoPlugins = false;
 
diff --git a/pkgs/by-name/db/dbcsr/package.nix b/pkgs/by-name/db/dbcsr/package.nix
index 3d403fee69c9..e63326f9abf3 100644
--- a/pkgs/by-name/db/dbcsr/package.nix
+++ b/pkgs/by-name/db/dbcsr/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dbcsr";
-  version = "2.8.0";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "cp2k";
     repo = "dbcsr";
     rev = "v${version}";
-    hash = "sha256-YXySNw3+DiY7E57W1ypeWLyawwcWVGlmTM4Kgj7Nnmo=";
+    hash = "sha256-ZhcatDG0bbl75P3YI5Kqg8lhbDZ8EHYaZSixky6KJyo=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/du/dump_syms/package.nix b/pkgs/by-name/du/dump_syms/package.nix
index 2ef24183e39b..b351c4cf8057 100644
--- a/pkgs/by-name/du/dump_syms/package.nix
+++ b/pkgs/by-name/du/dump_syms/package.nix
@@ -39,14 +39,16 @@ rustPlatform.buildRustPackage {
   checkFlags = [
     # Disable tests that require network access
     # ConnectError("dns error", Custom { kind: Uncategorized, error: "failed to lookup address information: Temporary failure in name resolution" })) }', src/windows/pdb.rs:725:56
-    "--skip windows::pdb::tests::test_ntdll"
-    "--skip windows::pdb::tests::test_oleaut32"
+    "--skip=windows::pdb::tests::test_ntdll"
+    "--skip=windows::pdb::tests::test_oleaut32"
   ];
 
   passthru.tests = {
     inherit firefox-esr-unwrapped firefox-unwrapped thunderbird-unwrapped;
   };
 
+  __structuredAttrs = true;
+
   meta = {
     changelog = "https://github.com/mozilla/dump_syms/blob/v${version}/CHANGELOG.md";
     description = "Command-line utility for parsing the debugging information the compiler provides in ELF or stand-alone PDB files";
diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index 3ee54e8e168d..92f6d53e3ace 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -33,14 +33,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2025.11.5";
+  version = "2025.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "esphome";
     tag = version;
-    hash = "sha256-ln+LuV//FVb+Jy6cMNth6RaFtusf/ZCLtYowlDnBybE=";
+    hash = "sha256-kp1pFNq5PNrmRzpQ2pUHXW4AEXyHEFKqofzmbe6zOJk=";
   };
 
   patches = [
diff --git a/pkgs/by-name/fa/fastlane/Gemfile.lock b/pkgs/by-name/fa/fastlane/Gemfile.lock
index d8c0b76d959f..20bfdd697a86 100644
--- a/pkgs/by-name/fa/fastlane/Gemfile.lock
+++ b/pkgs/by-name/fa/fastlane/Gemfile.lock
@@ -1,40 +1,40 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.7)
-      base64
-      nkf
-      rexml
+    CFPropertyList (3.0.8)
     abbrev (0.1.2)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
     artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.3.2)
-    aws-partitions (1.1106.0)
-    aws-sdk-core (3.224.0)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1194.0)
+    aws-sdk-core (3.239.2)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.101.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-kms (1.118.0)
+      aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.186.1)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-s3 (1.206.0)
+      aws-sdk-core (~> 3, >= 3.234.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.11.0)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
+    bigdecimal (3.3.1)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
+    csv (3.3.5)
     declarative (0.0.20)
     digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
@@ -54,14 +54,14 @@ GEM
       faraday-rack (~> 1.0)
       faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
+    faraday-cookie_jar (0.0.8)
       faraday (>= 0.8.0)
-      http-cookie (~> 1.0.0)
+      http-cookie (>= 1.0.0)
     faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
+    faraday-em_synchrony (1.0.1)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.1.0)
+    faraday-multipart (1.1.1)
       multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
@@ -71,15 +71,18 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.4.0)
-    fastlane (2.227.2)
+    fastlane (2.229.1)
       CFPropertyList (>= 2.3, < 4.0.0)
+      abbrev (~> 0.1.2)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
+      base64 (~> 0.2.0)
       bundler (>= 1.12.0, < 3.0.0)
       colored (~> 1.2)
       commander (~> 4.6)
+      csv (~> 3.3)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
       excon (>= 0.71.0, < 1.0.0)
@@ -99,7 +102,9 @@ GEM
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (>= 2.0.0, < 3.0.0)
+      mutex_m (~> 0.3.0)
       naturally (~> 2.2)
+      nkf (~> 0.2.0)
       optparse (>= 0.1.1, < 1.0.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
@@ -158,37 +163,37 @@ GEM
     httpclient (2.9.0)
       mutex_m
     jmespath (1.6.2)
-    json (2.12.1)
-    jwt (2.10.1)
+    json (2.18.0)
+    jwt (2.10.2)
       base64
     logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    multi_json (1.15.0)
+    multi_json (1.18.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
-    naturally (2.2.1)
+    naturally (2.3.0)
     nkf (0.2.0)
-    optparse (0.6.0)
+    optparse (0.8.1)
     os (1.1.4)
     plist (3.7.2)
-    public_suffix (6.0.2)
-    rake (13.2.1)
+    public_suffix (7.0.0)
+    rake (13.3.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.4.1)
+    rexml (3.4.4)
     rouge (3.28.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.4.1)
     security (0.1.5)
-    signet (0.20.0)
+    signet (0.21.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
+      jwt (>= 1.5, < 4.0)
       multi_json (~> 1.10)
     simctl (1.6.10)
       CFPropertyList
@@ -225,4 +230,4 @@ DEPENDENCIES
   fastlane
 
 BUNDLED WITH
-   2.6.6
+   2.7.2
diff --git a/pkgs/by-name/fa/fastlane/gemset.nix b/pkgs/by-name/fa/fastlane/gemset.nix
index fbf71e8fb866..b11eb5df1f52 100644
--- a/pkgs/by-name/fa/fastlane/gemset.nix
+++ b/pkgs/by-name/fa/fastlane/gemset.nix
@@ -15,10 +15,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
+      sha256 = "0mxhjgihzsx45l9wh2n0ywl9w0c6k70igm5r0d63dxkcagwvh4vw";
       type = "gem";
     };
-    version = "2.8.7";
+    version = "2.8.8";
   };
   artifactory = {
     groups = [ "default" ];
@@ -45,20 +45,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mvjjn8vh1c3nhibmjj9qcwxagj6m9yy961wblfqdmvhr9aklb3y";
+      sha256 = "0fqqdqg15rgwgz3mn4pj91agd20csk9gbrhi103d20328dfghsqi";
       type = "gem";
     };
-    version = "1.3.2";
+    version = "1.4.0";
   };
   aws-partitions = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "12svi07s5hss8wq9xpaxwy1ibl64bd00hsn12v810wvz19fw823l";
+      sha256 = "04887dhff1nw3pwrfxmqwl0mwd1dzmxfdvjgn6f6n9pl6mbwdinw";
       type = "gem";
     };
-    version = "1.1106.0";
+    version = "1.1194.0";
   };
   aws-sdk-core = {
     dependencies = [
@@ -66,6 +66,7 @@
       "aws-partitions"
       "aws-sigv4"
       "base64"
+      "bigdecimal"
       "jmespath"
       "logger"
     ];
@@ -73,10 +74,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1b0pi1iibp644dn78g53s7hs7gcxghfa7h8rz3lvz8ivykisl5y6";
+      sha256 = "0fgjki9wja72m5ip1dq5zx8msn1sdw9qid4z7wd0dnqbxr2ii056";
       type = "gem";
     };
-    version = "3.224.0";
+    version = "3.239.2";
   };
   aws-sdk-kms = {
     dependencies = [
@@ -87,10 +88,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mv8jc8sbvim2m3y3zxm8z4i5sh4x9ds7y9h5z04qfg7kjvbbn24";
+      sha256 = "1gbgf7xgg2hrrc51g3mpf0isba801w0r0z45mjnh45agdmcm3iy9";
       type = "gem";
     };
-    version = "1.101.0";
+    version = "1.118.0";
   };
   aws-sdk-s3 = {
     dependencies = [
@@ -102,10 +103,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "00sq22mfibxq3rjy9c4vj1s8yjszv8988di7z7rs8v62my53nw2v";
+      sha256 = "1v9as5bvkxk5nqfbchram8v7rsimnpp0v8wxcp20bwdw3dlf9yc5";
       type = "gem";
     };
-    version = "1.186.1";
+    version = "1.206.0";
   };
   aws-sigv4 = {
     dependencies = [ "aws-eventstream" ];
@@ -113,10 +114,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nx1il781qg58nwjkkdn9fw741cjjnixfsh389234qm8j5lpka2h";
+      sha256 = "003ch8qzh3mppsxch83ns0jra8d222ahxs96p9cdrl0grfazywv9";
       type = "gem";
     };
-    version = "1.11.0";
+    version = "1.12.1";
   };
   babosa = {
     groups = [ "default" ];
@@ -138,20 +139,25 @@
     };
     version = "0.2.0";
   };
-  CFPropertyList = {
-    dependencies = [
-      "base64"
-      "nkf"
-      "rexml"
-    ];
+  bigdecimal = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0k1w5i4lb1z941m7ds858nly33f3iv12wvr1zav5x3fa99hj2my4";
+      sha256 = "0612spks81fvpv2zrrv3371lbs6mwd7w6g5zafglyk75ici1x87a";
       type = "gem";
     };
-    version = "3.0.7";
+    version = "3.3.1";
+  };
+  CFPropertyList = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0qa226xndfs9r6c7qj7zs6yhzrcbmicvvxsjn9x3svakh3cx169c";
+      type = "gem";
+    };
+    version = "3.0.8";
   };
   claide = {
     groups = [ "default" ];
@@ -194,6 +200,16 @@
     };
     version = "4.6.0";
   };
+  csv = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0gz7r2kazwwwyrwi95hbnhy54kwkfac5swh2gy5p5vw36fn38lbf";
+      type = "gem";
+    };
+    version = "3.3.5";
+  };
   declarative = {
     groups = [ "default" ];
     platforms = [ ];
@@ -287,10 +303,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "00hligx26w9wdnpgsrf0qdnqld4rdccy8ym6027h5m735mpvxjzk";
+      sha256 = "1fwx5720g33w3zycyq636m4fbn5fd94fxk4g0b3n7k7q4dc60h01";
       type = "gem";
     };
-    version = "0.0.7";
+    version = "0.0.8";
   };
   faraday-em_http = {
     groups = [ "default" ];
@@ -307,10 +323,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6";
+      sha256 = "0l0pz1wk2mk6p6hbfd86jfad59jyk201y1db379qhc2lrxfy8g5z";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.0.1";
   };
   faraday-excon = {
     groups = [ "default" ];
@@ -338,10 +354,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5";
+      sha256 = "00w9imp55hi81q0wsgwak90ldkk7gbyb8nzmmv8hy0s907s8z8bp";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.1.1";
   };
   faraday-net_http = {
     groups = [ "default" ];
@@ -417,12 +433,15 @@
   fastlane = {
     dependencies = [
       "CFPropertyList"
+      "abbrev"
       "addressable"
       "artifactory"
       "aws-sdk-s3"
       "babosa"
+      "base64"
       "colored"
       "commander"
+      "csv"
       "dotenv"
       "emoji_regex"
       "excon"
@@ -442,7 +461,9 @@
       "jwt"
       "mini_magick"
       "multipart-post"
+      "mutex_m"
       "naturally"
+      "nkf"
       "optparse"
       "plist"
       "rubyzip"
@@ -461,10 +482,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1dw9smmpzhlca2zzp2pgmr2slhwnz8926s5rnjfjrclilz33p22z";
+      sha256 = "08q875hq41yvw44n55lsjz41pfawys85c4ws9swg5jwx7hf8rv3z";
       type = "gem";
     };
-    version = "2.227.2";
+    version = "2.229.1";
   };
   fastlane-sirp = {
     dependencies = [ "sysrandom" ];
@@ -668,10 +689,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fr0dxwn5a7z5m3i16v66pc35wmwc6mgj9f8dg7ch2bwq42y73zw";
+      sha256 = "01fmiz052cvnxgdnhb3qwcy88xbv7l3liz0fkvs5qgqqwjp0c1di";
       type = "gem";
     };
-    version = "2.12.1";
+    version = "2.18.0";
   };
   jwt = {
     dependencies = [ "base64" ];
@@ -679,10 +700,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1i8wmzgb5nfhvkx1f6bhdwfm7v772172imh439v3xxhkv3hllhp6";
+      sha256 = "1x64l31nkqjwfv51s2vsm0yqq4cwzrlnji12wvaq761myx3fxq9i";
       type = "gem";
     };
-    version = "2.10.1";
+    version = "2.10.2";
   };
   logger = {
     groups = [ "default" ];
@@ -719,10 +740,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
+      sha256 = "0vsrfm36zlg7jbrd1fjbr8kmdvr8bfayrw0hdlza75987vvhrxr3";
       type = "gem";
     };
-    version = "1.15.0";
+    version = "1.18.0";
   };
   multipart-post = {
     groups = [ "default" ];
@@ -759,10 +780,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "04x1nkx6gkqzlc4phdvq05v3vjds6mgqhjqzqpcs6vdh5xyqrf59";
+      sha256 = "00cy2wg40rsasnbl0cjcj3jcghq068v445rh90q63rn2fv7j76a5";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.3.0";
   };
   nkf = {
     groups = [ "default" ];
@@ -779,10 +800,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1306kdvq0xr333xma4452zvvvw6mx7fw20fwi6508i6dq5lh9s95";
+      sha256 = "06mx0g76bqwyrv8hxdikhyziyq8x8j8rk9l0y3scyz4hac6s3gj2";
       type = "gem";
     };
-    version = "0.6.0";
+    version = "0.8.1";
   };
   os = {
     groups = [ "default" ];
@@ -809,20 +830,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz";
+      sha256 = "15dhl6k4gbax0xz8frfs4nsb6lg5zgax9vkr1pqzjmhfxddhn2gp";
       type = "gem";
     };
-    version = "6.0.2";
+    version = "7.0.0";
   };
   rake = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
+      sha256 = "175iisqb211n0qbfyqd8jz2g01q6xj038zjf4q0nm8k6kz88k7lc";
       type = "gem";
     };
-    version = "13.2.1";
+    version = "13.3.1";
   };
   representable = {
     dependencies = [
@@ -854,10 +875,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7";
+      sha256 = "0hninnbvqd2pn40h863lbrn9p11gvdxp928izkag5ysx8b1s5q0r";
       type = "gem";
     };
-    version = "3.4.1";
+    version = "3.4.4";
   };
   rouge = {
     groups = [ "default" ];
@@ -910,10 +931,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18s7xiclzajp9w9cmq8k28iy5ig1zpx1zv1mrm416cb2c0m0wrmw";
+      sha256 = "0nydm087m5c3j85gvzvz30w1qb9pl2lzpznw746jha29ybxyj5yn";
       type = "gem";
     };
-    version = "0.20.0";
+    version = "0.21.0";
   };
   simctl = {
     dependencies = [
diff --git a/pkgs/by-name/fa/faugus-launcher/package.nix b/pkgs/by-name/fa/faugus-launcher/package.nix
index ad1c33fb8ac3..4ed00054e8f1 100644
--- a/pkgs/by-name/fa/faugus-launcher/package.nix
+++ b/pkgs/by-name/fa/faugus-launcher/package.nix
@@ -18,14 +18,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "faugus-launcher";
-  version = "1.11.3";
+  version = "1.11.4";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "Faugus";
     repo = "faugus-launcher";
     tag = version;
-    hash = "sha256-lmQctCjWKBdEtALIdasQ6M3KwB89mmwier8VqecnmzE=";
+    hash = "sha256-zkrjZnsugpdG7SAkSAt3OicxIr2fA1j1/Lyh0lRScWA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fu/fulcio/package.nix b/pkgs/by-name/fu/fulcio/package.nix
index cdba3ec955da..c01675a30b48 100644
--- a/pkgs/by-name/fu/fulcio/package.nix
+++ b/pkgs/by-name/fu/fulcio/package.nix
@@ -15,13 +15,13 @@
 
 buildGoModule rec {
   pname = "fulcio";
-  version = "1.8.3";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = "fulcio";
     tag = "v${version}";
-    hash = "sha256-yR8Q1ksz1fB8sc8NA6Hr4dwe5VXerEgIQYiIpNTOEf8=";
+    hash = "sha256-+5aYfHR8v7A5U73rTkXoUInWDt044JcPDwQt2iKaqBw=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -33,7 +33,7 @@ buildGoModule rec {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-G+vtNCm9Ecpj5IzxXojzcjGEQL47R5gNMFI/JCs7C0w=";
+  vendorHash = "sha256-EtanisQJclkIh2m+M51kGrWvOP/4Y+Y2zbxfSJ25cLk=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix
index 46dec148531d..3f624e395b24 100644
--- a/pkgs/by-name/ga/gate/package.nix
+++ b/pkgs/by-name/ga/gate/package.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "gate";
-  version = "0.61.0";
+  version = "0.62.0";
 in
 buildGoModule {
   inherit pname version;
@@ -15,7 +15,7 @@ buildGoModule {
     owner = "minekube";
     repo = "gate";
     tag = "v${version}";
-    hash = "sha256-HCxsydmCjhbL2hiZ4EEjsODXKWoAv2Azi/HvUU6aOIg=";
+    hash = "sha256-8zvHC6Ghf2IziCLYTxGe/z3u6li37EBOb5AK2gGhoUQ=";
   };
 
   vendorHash = "sha256-f7SkECS80Lwkd0xSzHq+x05ZBjBYKXsA4rPidyIAYak=";
diff --git a/pkgs/by-name/ge/gelly/package.nix b/pkgs/by-name/ge/gelly/package.nix
new file mode 100644
index 000000000000..6acb8832f263
--- /dev/null
+++ b/pkgs/by-name/ge/gelly/package.nix
@@ -0,0 +1,80 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  dbus,
+  glib,
+  wrapGAppsHook4,
+  glib-networking,
+  gst_all_1,
+  gtk4,
+  libadwaita,
+  libseccomp,
+  openssl,
+  bubblewrap,
+  glycin-loaders,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "gelly";
+  version = "0.11.0";
+
+  src = fetchFromGitHub {
+    owner = "Fingel";
+    repo = "gelly";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-fZrSfxbWkHX5yUwC4NkDmXcNDTvsdwceEBkmUmxWcoQ=";
+  };
+
+  cargoHash = "sha256-vnFbRvq+EPIcJ4w+QKpkXrl5BLr/KbELbmpRGQwcaUE=";
+
+  nativeBuildInputs = [
+    pkg-config
+    glib # for `glib-compile-schemas` and `glib-compile-resources` (used in upstream's `build.rs`)
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    dbus
+    # Very important, so that gstreamer supports TLS
+    glib-networking
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-ugly
+    gst_all_1.gst-plugins-rs
+    gtk4
+    libadwaita
+    libseccomp
+    openssl
+  ];
+
+  # Adapted from upstream's `justfile`
+  postInstall = ''
+    install -Dm644 resources/io.m51.Gelly.desktop $out/share/applications/io.m51.Gelly.desktop
+    install -Dm644 resources/io.m51.Gelly.metainfo.xml $out/share/metainfo/io.m51.Gelly.metainfo.xml
+    install -Dm644 resources/io.m51.Gelly.svg $out/share/icons/hicolor/scalable/apps/io.m51.Gelly.svg
+
+    # Use the gschemas location as specified in the glib hook
+    install -Dm644 resources/io.m51.Gelly.gschema.xml $out/share/gsettings-schemas/$name/glib-2.0/schemas/io.m51.Gelly.gschema.xml
+    glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas/
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix PATH : "$out/bin:${lib.makeBinPath [ bubblewrap ]}"
+      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
+    )
+  '';
+
+  meta = {
+    description = "A Jellyfin GTK client for Linux focused on music";
+    homepage = "https://github.com/Fingel/gelly";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ minijackson ];
+    mainProgram = "gelly";
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/gk/gkrellm/package.nix b/pkgs/by-name/gk/gkrellm/package.nix
index 99bdbe267416..9db44ac580f3 100644
--- a/pkgs/by-name/gk/gkrellm/package.nix
+++ b/pkgs/by-name/gk/gkrellm/package.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gkrellm";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchurl {
     url = "http://gkrellm.srcbox.net/releases/gkrellm-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-b4NmV2C5Nq1LVfkYKx7HYB+vOKDyXqHkvdyZZQiPAy0=";
+    hash = "sha256-aMdaA6Brk1r6k9MzHKHC2GLB1Qw+nfGdmo1Ilw12a1U=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/go/goa/package.nix b/pkgs/by-name/go/goa/package.nix
index d3db636c31f2..9832455a1979 100644
--- a/pkgs/by-name/go/goa/package.nix
+++ b/pkgs/by-name/go/goa/package.nix
@@ -6,15 +6,15 @@
 
 buildGoModule rec {
   pname = "goa";
-  version = "3.23.2";
+  version = "3.23.4";
 
   src = fetchFromGitHub {
     owner = "goadesign";
     repo = "goa";
     rev = "v${version}";
-    hash = "sha256-8AcpYTc909MyQYJBArHypMOefNcj1DaJcM2w4NpmcLI=";
+    hash = "sha256-7+hOXJU2a39ytn08FlR/YAhOnAmVL5JxdcvF1AlOxHk=";
   };
-  vendorHash = "sha256-2H5VtNZiOnx1gFSVaBu7q4HTeLhBbIDK01fixBB66M4=";
+  vendorHash = "sha256-VSjiEgkjLMFRThNI4G7O91wpF8CYaIVYOrtE49S/o3w=";
 
   subPackages = [ "cmd/goa" ];
 
diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 6be30a70cd97..5a11e0c291c7 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -170,11 +170,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "143.0.7499.109";
+    version = "143.0.7499.146";
 
     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-36YeOTThfFzMQs+wxxFLwwUmp0uPBb0+b8TD7LG1e+0=";
+      hash = "sha256-GhEPDoloqlnEYZ/laVaQdNolxnW9DBVx2Ete9Mj0GDQ=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -272,11 +272,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "143.0.7499.110";
+    version = "143.0.7499.147";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/p5xbkc3osahdfsgniofymq5nqq_143.0.7499.110/GoogleChrome-143.0.7499.110.dmg";
-      hash = "sha256-Ed0THsSrWWK0x/h+yhzQdU8PBrZkM/tLiqDEnWAtCMw=";
+      url = "http://dl.google.com/release2/chrome/ad7e74qqebdgksg3f2kar635d3fq_143.0.7499.147/GoogleChrome-143.0.7499.147.dmg";
+      hash = "sha256-/gwm6RxHsqd6cMiGI8P2ZhqKx+/LTcpXAs4dfNZnBn8=";
     };
 
     dontPatch = true;
diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix
index ccaa0d09617c..f2971bd2e96c 100644
--- a/pkgs/by-name/gr/greenmask/package.nix
+++ b/pkgs/by-name/gr/greenmask/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "greenmask";
-  version = "0.2.14";
+  version = "0.2.15";
 
   src = fetchFromGitHub {
     owner = "GreenmaskIO";
     repo = "greenmask";
     tag = "v${version}";
-    hash = "sha256-AHZJWYHfUKYNXPP6vFIM5tdr5aQ8q2pkqB/M1lhxUic=";
+    hash = "sha256-/At0boolTyge4VNy1EDpK09Yo7hLAdq6SvCbyBTKGbw=";
   };
 
   vendorHash = "sha256-t2U65GAGBGdMRXPTkCQCuXfLuqohA6erTlvAN/xx/ek=";
diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix
index cb40367c40a5..f01e102e0afe 100644
--- a/pkgs/by-name/hi/hifile/package.nix
+++ b/pkgs/by-name/hi/hifile/package.nix
@@ -27,6 +27,7 @@ appimageTools.wrapType2 {
     install -m 444 -D ${appimageContents}/HiFile.png $out/share/icons/hicolor/512x512/apps/HiFile.png
     substituteInPlace $out/share/applications/HiFile.desktop \
       --replace-fail 'Exec=HiFile' 'Exec=hifile'
+    echo "StartupWMClass=app.hifile.www.HiFile" >> $out/share/applications/HiFile.desktop
   '';
 
   passthru.updateScript = ./update.sh;
diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/by-name/hu/hugin/package.nix
similarity index 85%
rename from pkgs/applications/graphics/hugin/default.nix
rename to pkgs/by-name/hu/hugin/package.nix
index aad78856a954..1e9f0c735191 100644
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/by-name/hu/hugin/package.nix
@@ -36,11 +36,11 @@
 
 stdenv.mkDerivation rec {
   pname = "hugin";
-  version = "2024.0.1";
+  version = "2025.0.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2";
-    hash = "sha256-E+wM3utOtjFJyDN2jT43Tnz1pqjY0C1QiFzklvBbp+Q=";
+    hash = "sha256-DeJ6XVQy421OXTisJde8r8e33VQqqwMWQKYe1mdnB2w";
   };
 
   buildInputs = [
@@ -82,6 +82,13 @@ stdenv.mkDerivation rec {
   # disable installation of the python scripting interface
   cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ];
 
+  # hugin libs are added to NEEDED but not to RUNPATH
+  postFixup = ''
+    for p in $out/bin/..*; do
+      patchelf "$p" --add-rpath $out/lib/hugin
+    done
+  '';
+
   postInstall = ''
     for p in $out/bin/*; do
       wrapProgram "$p" \
diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix
index c2de5a00ffa2..58e7bcf3ee6d 100644
--- a/pkgs/by-name/hy/hydra/package.nix
+++ b/pkgs/by-name/hy/hydra/package.nix
@@ -38,7 +38,7 @@
   mdbook,
   foreman,
   python3,
-  libressl,
+  netcat,
   cacert,
   glibcLocales,
   meson,
@@ -210,7 +210,7 @@ stdenv.mkDerivation (finalAttrs: {
     foreman
     glibcLocales
     python3
-    libressl.nc
+    netcat
     nix-eval-jobs
     openldap
     postgresql
diff --git a/pkgs/by-name/hy/hyprspace/package.nix b/pkgs/by-name/hy/hyprspace/package.nix
index 5976f204f070..2aff2b9a28de 100644
--- a/pkgs/by-name/hy/hyprspace/package.nix
+++ b/pkgs/by-name/hy/hyprspace/package.nix
@@ -9,18 +9,18 @@
 
 buildGoModule rec {
   pname = "hyprspace";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "hyprspace";
     repo = "hyprspace";
     tag = "v${version}";
-    hash = "sha256-Lv/Mb7vj1bUj5TajIdM6bu8299y+B3sZfE6xlA6sXcM=";
+    hash = "sha256-VOufAPhCbLzVxrj/XKwunJkxUx0EAovV4+adrQLwcoI=";
   };
 
   env.CGO_ENABLED = "0";
 
-  vendorHash = "sha256-97uIl3b3hs3BCLH7UZX8NU3kLloVQOCN9ygsdxsfass=";
+  vendorHash = "sha256-m7asItMMFm/lHNl4nemvuMU0mn69kTrC1XK4rUCOor4=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/in/intel-graphics-compiler/package.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix
index e19335d5081f..d3d217f9591d 100644
--- a/pkgs/by-name/in/intel-graphics-compiler/package.nix
+++ b/pkgs/by-name/in/intel-graphics-compiler/package.nix
@@ -19,7 +19,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "intel-graphics-compiler";
-  version = "2.22.2";
+  version = "2.24.8";
 
   # See the repository for expected versions:
   # <https://github.com/intel/intel-graphics-compiler/blob/v2.16.0/documentation/build_ubuntu.md#revision-table>
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
       owner = "intel";
       repo = "intel-graphics-compiler";
       tag = "v${version}";
-      hash = "sha256-4Tp9kY+Sbirf4kN/C5Q1ClcoUI/fhfUJpqL+/eO8a/o=";
+      hash = "sha256-h/YlZatUn61M5/F4msJljZDWcQyivgCAi1HC9CXvTts=";
     })
     (fetchFromGitHub {
       name = "llvm-project";
@@ -42,22 +42,22 @@ stdenv.mkDerivation rec {
       name = "vc-intrinsics";
       owner = "intel";
       repo = "vc-intrinsics";
-      tag = "v0.23.4";
-      hash = "sha256-zorhOhBTcymnAlShJxJecXD+HIfScGouhSea/A3tBXE=";
+      tag = "v0.24.1";
+      hash = "sha256-IpScRc+sWEcD8ZH5TinMPVFq1++vIVp774TJsg8mUMY=";
     })
     (fetchFromGitHub {
       name = "opencl-clang";
       owner = "intel";
       repo = "opencl-clang";
-      tag = "v16.0.5";
-      hash = "sha256-JfynEsCXltVdVY/LqWvZwzWfzEFUz6nI9Zub+bze1zE=";
+      tag = "v16.0.6";
+      hash = "sha256-qxMnKQWQ32yF2rZGGOel2ynZJKfbAlk9U+ttWuzYRog=";
     })
     (fetchFromGitHub {
       name = "llvm-spirv";
       owner = "KhronosGroup";
       repo = "SPIRV-LLVM-Translator";
-      tag = "v16.0.18";
-      hash = "sha256-JwFwjHUv1tBC7KDWAhkse557R6QCaVjOekhndQlVetM=";
+      tag = "v16.0.19";
+      hash = "sha256-GTTEThCNPyq0CpD6Vp4L0ZEEqOZ7uLbt9sdgXLs7MUg=";
     })
   ];
 
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
     git -C llvm-project init
     git -C llvm-project -c user.name=nixbld -c user.email= commit --allow-empty -m stub
     substituteInPlace llvm-project/llvm/projects/opencl-clang/cmake/modules/CMakeFunctions.cmake \
-      --replace-fail 'COMMAND ''${GIT_EXECUTABLE} am --3way --ignore-whitespace -C0 ' \
+      --replace-fail 'COMMAND ''${GIT_EXECUTABLE} am --3way --keep-non-patch --ignore-whitespace -C0 ' \
                      'COMMAND patch -p1 --ignore-whitespace -i '
 
     # match default LLVM version with our provided version to apply correct patches
diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix
index b5354c6261ea..0c9e582d1962 100644
--- a/pkgs/by-name/ku/kubevpn/package.nix
+++ b/pkgs/by-name/ku/kubevpn/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubevpn";
-  version = "2.9.10";
+  version = "2.9.11";
 
   src = fetchFromGitHub {
     owner = "KubeNetworks";
     repo = "kubevpn";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5yuJfGWNEQ/1ufV1rVze2JrL/67/UlYdG2YH9i+gI3w=";
+    hash = "sha256-x6GYkLGPiH061QQW9YnTeHLNTrM5Q8Odm0seODQRZgk=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/lc/lctime/package.nix b/pkgs/by-name/lc/lctime/package.nix
index 08db563674bd..ceaa45443ccd 100644
--- a/pkgs/by-name/lc/lctime/package.nix
+++ b/pkgs/by-name/lc/lctime/package.nix
@@ -11,7 +11,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "lctime";
-  version = "0.0.26";
+  version = "0.0.27";
   pyproject = true;
 
   src = fetchFromGitea {
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
     owner = "librecell";
     repo = "lctime";
     tag = version;
-    hash = "sha256-oNmeV8r1dtO2y27jAJnlx4mKGjhzL07ad2yBdOLwgF0=";
+    hash = "sha256-KKZhsKNTr+J5+rLUdlwGMsUCa6NYY1X9yaujPe1c0Do=";
   };
 
   build-system = with python3Packages; [
@@ -30,7 +30,6 @@ python3Packages.buildPythonApplication rec {
     joblib
     klayout
     liberty-parser
-    matplotlib
     networkx
     numpy
     pyspice
@@ -38,6 +37,8 @@ python3Packages.buildPythonApplication rec {
     sympy
   ];
 
+  optional-dependencies.debug = with python3Packages; [ matplotlib ];
+
   nativeCheckInputs = with python3Packages; [
     pytestCheckHook
     ngspice
diff --git a/pkgs/by-name/lg/lgpio/package.nix b/pkgs/by-name/lg/lgpio/package.nix
index 73d8c4853d1e..21051bcfa660 100644
--- a/pkgs/by-name/lg/lgpio/package.nix
+++ b/pkgs/by-name/lg/lgpio/package.nix
@@ -55,6 +55,7 @@ mkDerivation rec {
 
   makeFlags = [
     "prefix=$(out)"
+    "CROSS_PREFIX=${stdenv.cc.targetPrefix}"
   ];
 
   meta = {
diff --git a/pkgs/by-name/li/libnspsl/package.nix b/pkgs/by-name/li/libnspsl/package.nix
index a7905669ef5d..7206b5358b44 100644
--- a/pkgs/by-name/li/libnspsl/package.nix
+++ b/pkgs/by-name/li/libnspsl/package.nix
@@ -4,6 +4,7 @@
   fetchurl,
   pkg-config,
   netsurf-buildsystem,
+  publicsuffix-list,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -15,6 +16,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-NoTOwy9VXa7UMZk+C/bL2TdPbJCERiN+CJ8LYdaUrIA=";
   };
 
+  postPatch = ''
+    rm public_suffix_list.dat
+    ln -s ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat public_suffix_list.dat
+  '';
+
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ netsurf-buildsystem ];
diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix
index 757bceb94699..302ed505d19c 100644
--- a/pkgs/by-name/lu/lunar-client/package.nix
+++ b/pkgs/by-name/lu/lunar-client/package.nix
@@ -7,11 +7,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "lunarclient";
-  version = "3.5.11";
+  version = "3.5.13";
 
   src = fetchurl {
     url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage";
-    hash = "sha512-YYsUyuJMYos8aiOCbQy7FlVRakfBXC63HiTbg3YBd8I+kR1zA38FWAkRZeAiA3WyUutmJLJxaDtwBzhq/QgQ7w==";
+    hash = "sha512-MvR5gnJxCUuYstgpGoux2oA3evN9bqXmnEjPBSvBSGzMiZmz0Iox5cfBeaHf+GlwL+9rFs2bhKaeJSinI2FQaw==";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/ma/maid/Gemfile b/pkgs/by-name/ma/maid/Gemfile
index 9ac699f872dc..d8cd7bb75e05 100644
--- a/pkgs/by-name/ma/maid/Gemfile
+++ b/pkgs/by-name/ma/maid/Gemfile
@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
-gem 'maid', '~> 0.10.0'
+gem 'maid', '~> 0.11.2'
 gem 'rake'
diff --git a/pkgs/by-name/ma/maid/Gemfile.lock b/pkgs/by-name/ma/maid/Gemfile.lock
index 3b706c80212c..510e04803717 100644
--- a/pkgs/by-name/ma/maid/Gemfile.lock
+++ b/pkgs/by-name/ma/maid/Gemfile.lock
@@ -21,7 +21,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    maid (0.10.0)
+    maid (0.11.2)
       deprecated (~> 3.0.0)
       dimensions (>= 1.0.0, < 2.0)
       escape (>= 0.0.1, < 0.1.0)
@@ -31,7 +31,7 @@ GEM
       mime-types (~> 3.0, < 4.0)
       rubyzip (~> 2.3.2)
       rufus-scheduler (~> 3.8.2)
-      thor (~> 1.2.1)
+      thor (~> 1.4.0)
       xdg (~> 2.2.3)
     mime-types (3.7.0)
       logger
@@ -45,7 +45,7 @@ GEM
     rubyzip (2.3.2)
     rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
-    thor (1.2.2)
+    thor (1.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     xdg (2.2.5)
@@ -54,8 +54,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  maid (~> 0.10.0)
+  maid (~> 0.11.2)
   rake
 
 BUNDLED WITH
-   2.6.6
+   2.7.2
diff --git a/pkgs/by-name/ma/maid/gemset.nix b/pkgs/by-name/ma/maid/gemset.nix
index d7618cccc983..01ba5e80287a 100644
--- a/pkgs/by-name/ma/maid/gemset.nix
+++ b/pkgs/by-name/ma/maid/gemset.nix
@@ -160,10 +160,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0v1lhwgxyli10rinw6h33ikhskx9j3b20h7plrx8c69z05sfsdd9";
+      sha256 = "154rhbdplhrirxpli2jwwsmzcrk8vj51cn6zh8r7lp97vlrkybgp";
       type = "gem";
     };
-    version = "0.10.0";
+    version = "0.11.2";
   };
   mime-types = {
     dependencies = [
@@ -256,10 +256,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg";
+      sha256 = "0gcarlmpfbmqnjvwfz44gdjhcmm634di7plcx2zdgwdhrhifhqw7";
       type = "gem";
     };
-    version = "1.2.2";
+    version = "1.4.0";
   };
   tzinfo = {
     dependencies = [ "concurrent-ruby" ];
diff --git a/pkgs/by-name/ma/mathjax/package.nix b/pkgs/by-name/ma/mathjax/package.nix
index 9811b2387d83..83d12cb011c9 100644
--- a/pkgs/by-name/ma/mathjax/package.nix
+++ b/pkgs/by-name/ma/mathjax/package.nix
@@ -5,13 +5,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "mathjax";
-  version = "4.0.0";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "mathjax";
     repo = "mathjax";
     tag = finalAttrs.version;
-    hash = "sha256-36lTjx4zuFeT1+QFemiQcCZfAjyh7vFPpYeRhO2mzGI=";
+    hash = "sha256-ri8j/S0mS0I12y3o8NCCMcR3FHeuaNKg/+zEkNB2uXU=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/md/mdbook-toc/package.nix b/pkgs/by-name/md/mdbook-toc/package.nix
index 1efceb72fe44..59ff38111c37 100644
--- a/pkgs/by-name/md/mdbook-toc/package.nix
+++ b/pkgs/by-name/md/mdbook-toc/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mdbook-toc";
-  version = "0.15.1";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     owner = "badboy";
     repo = "mdbook-toc";
     tag = version;
-    sha256 = "sha256-FPbZH8cEYQ9wbSm6jA5/uiX8Wgx/FyuIJ/gPgSKUhBA=";
+    sha256 = "sha256-gzwsPRhsAQTraiK/N5dKEj8NTpV/mYmECpS4KVl4Ql8=";
   };
 
-  cargoHash = "sha256-haHJkyYAc4+ODJNEWiXzbl1xbJ7pyrtnPX/+ubjvX44=";
+  cargoHash = "sha256-+YvEptJlNjomIsyS7cNImwYa1SxawY05e5vq9VmrktA=";
 
   meta = {
     description = "Preprocessor for mdbook to add inline Table of Contents support";
diff --git a/pkgs/by-name/md/mdfried/package.nix b/pkgs/by-name/md/mdfried/package.nix
index 886f18c22817..28e7059e2cac 100644
--- a/pkgs/by-name/md/mdfried/package.nix
+++ b/pkgs/by-name/md/mdfried/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdfried";
-  version = "0.14.6";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "benjajaja";
     repo = "mdfried";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ys/CoyaIKVVRtQfmjc4XOABdrktZ1lIPNqw0V8jlY5I=";
+    hash = "sha256-V++xkJBnTlqzcsw6BDkrqScIV+phzxyDqQXcV34L4ps=";
   };
 
-  cargoHash = "sha256-ipNhqxcc+Kfr6XtF3QtFh896YK5v1u4kXapiMUjC9n8=";
+  cargoHash = "sha256-qnsJkwAmBcakYcoqGdYRqfN6e46PG5IH6SAXLvy3mM8=";
 
   doCheck = true;
 
diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix
index a762f32c1ce3..50b85e298850 100644
--- a/pkgs/by-name/me/meilisearch/package.nix
+++ b/pkgs/by-name/me/meilisearch/package.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "meilisearch";
-  version = "1.28.2";
+  version = "1.30.0";
 
   src = fetchFromGitHub {
     owner = "meilisearch";
     repo = "meiliSearch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Sp3YAAOgkBoBIz4Yj0AKJ0aI0HBAIg75E9BjtzGxXLM=";
+    hash = "sha256-oq/jP+b4KwjpVvj/yBmzIOm+TM13dup40dAD0ID2Juc=";
   };
 
   cargoBuildFlags = [ "--package=meilisearch" ];
 
-  cargoHash = "sha256-W6nTVgD0U4bZ0ybGU6wTQmp+SVvorZCqKOJnf1GG1gU=";
+  cargoHash = "sha256-ooggvDUSrtY6X+GGHjU/rsP/q9Br2OUMTvVYUfVdAtk=";
 
   # Default features include mini dashboard which downloads something from the internet.
   buildNoDefaultFeatures = true;
diff --git a/pkgs/by-name/mi/mint-l-theme/package.nix b/pkgs/by-name/mi/mint-l-theme/package.nix
index 91b28a253aba..fb0088632f1c 100644
--- a/pkgs/by-name/mi/mint-l-theme/package.nix
+++ b/pkgs/by-name/mi/mint-l-theme/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "mint-l-theme";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "mint-l-theme";
     rev = version;
-    hash = "sha256-RdcojX+8SQDJ9LPb81iMzdoCZBpoypf/+aQcgotnVGE=";
+    hash = "sha256-jrNVeeqOBDf77Lz68qyjHllA4C3PQRySYQH7Sva2UHU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mi/mint-themes/package.nix b/pkgs/by-name/mi/mint-themes/package.nix
index 3cd8d52327c2..44797cc78cb5 100644
--- a/pkgs/by-name/mi/mint-themes/package.nix
+++ b/pkgs/by-name/mi/mint-themes/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "mint-themes";
-  version = "2.3.4";
+  version = "2.3.5";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "mint-themes";
     rev = version;
-    hash = "sha256-A4k9iy0d9pGPSYa4m3tAv2GKhFuJPrQODbv+LcP/YXU=";
+    hash = "sha256-folnnA4By1Dd1amriGiTl5mOxpcnaFjdp/UsjacE8GA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index a02fe56f487e..36965fdba4b1 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -9,12 +9,12 @@
 }:
 let
   pname = "models-dev";
-  version = "0-unstable-2025-12-11";
+  version = "0-unstable-2025-12-15";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "0c66fc84a2deb49500b9bb67e37d87428f544119";
-    hash = "sha256-HAGUVpdW0gLXCo3jCU7pnjvh1cTp8xnU59MXgCwQkGs=";
+    rev = "14c7777ca5952619b9dcf46e5bf60a7dd25080be";
+    hash = "sha256-+JJtaUmjwNXPnBP2jCc/r+Yswa+xViH9CVZzdmyXo+A=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix
index bcdcd92a7a3d..8aa4ad3ce5f8 100644
--- a/pkgs/by-name/mo/monado/package.nix
+++ b/pkgs/by-name/mo/monado/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  fetchpatch2,
   writeText,
   bluez,
   cjson,
@@ -65,24 +64,16 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "monado";
-  version = "25.0.0";
+  version = "25.1.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "monado";
     repo = "monado";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VxTxvw+ftqlh3qF5qWxpK1OJsRowkRXu0xEH2bDckUA=";
+    hash = "sha256-hUSm76PV+FhvzhiYMUbGcNDQMK1TZCPYh1PNADJmdSU=";
   };
 
-  patches = [
-    # Remove with v26
-    (fetchpatch2 {
-      url = "https://gitlab.freedesktop.org/monado/monado/-/commit/2a6932d46dad9aa957205e8a47ec2baa33041076.patch";
-      hash = "sha256-CZMbGgx7mEDcjcoRJHDZ5P6BecFW8CB4fpzxQ9bpAvE=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     doxygen
diff --git a/pkgs/by-name/ne/nemo/package.nix b/pkgs/by-name/ne/nemo/package.nix
index e39f7697da29..9098e2b6e052 100644
--- a/pkgs/by-name/ne/nemo/package.nix
+++ b/pkgs/by-name/ne/nemo/package.nix
@@ -14,6 +14,7 @@
   cinnamon-desktop,
   xapp,
   xapp-symbolic-icons,
+  xdg-user-dirs,
   libexif,
   json-glib,
   exempi,
@@ -36,13 +37,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "nemo";
-  version = "6.6.1";
+  version = "6.6.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "nemo";
     rev = version;
-    hash = "sha256-oJvGuPm6FOknSe+5TDLNf0eoE3xC+i78SkYdJUBY4PU=";
+    hash = "sha256-5jgD2C71sQkqnAGsnsjK8W9qaLtNtGeYLXsV2+7u2jU=";
   };
 
   patches = [
@@ -95,13 +96,19 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     gappsWrapperArgs+=(
-       --prefix XDG_DATA_DIRS : ${
+       --prefix XDG_DATA_DIRS : "${
          lib.makeSearchPath "share" [
            # For non-fd.o icons.
            xapp
            xapp-symbolic-icons
          ]
-       }
+       }"
+       --prefix PATH : "${
+         lib.makeBinPath [
+           # For xdg-user-dirs-update.
+           xdg-user-dirs
+         ]
+       }"
     )
   '';
 
diff --git a/pkgs/by-name/ne/networkmanager-l2tp/package.nix b/pkgs/by-name/ne/networkmanager-l2tp/package.nix
index 3e1ccfdd95eb..51abfafae5ba 100644
--- a/pkgs/by-name/ne/networkmanager-l2tp/package.nix
+++ b/pkgs/by-name/ne/networkmanager-l2tp/package.nix
@@ -23,13 +23,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}";
   pname = "NetworkManager-l2tp";
-  version = "1.20.20";
+  version = "1.20.22";
 
   src = fetchFromGitHub {
     owner = "nm-l2tp";
     repo = "network-manager-l2tp";
     rev = version;
-    hash = "sha256-AmbDWBCUG9fvqA6iJopYtbitdRwv2faWvIeKN90p234=";
+    hash = "sha256-TuYLNjogR3psb1B9zonHzRQext0ROS4ueD2WcWkseJk=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix
index 4a2fe0825d46..90370188deb9 100644
--- a/pkgs/by-name/ne/nextcloud-client/package.nix
+++ b/pkgs/by-name/ne/nextcloud-client/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation rec {
   pname = "nextcloud-client";
-  version = "4.0.3";
+  version = "4.0.4";
 
   outputs = [
     "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     owner = "nextcloud-releases";
     repo = "desktop";
     tag = "v${version}";
-    hash = "sha256-PwL5USUP60ePxn0U7zyx6hHQlx4xKVquZ1QLTWTsSRU=";
+    hash = "sha256-BEjsIx0knmTj6kgM7fsJV5XN660cRe9DbYxeL7YHPRo=";
   };
 
   patches = [
diff --git a/pkgs/by-name/no/noriskclient-launcher-unwrapped/disable-bundling.patch b/pkgs/by-name/no/noriskclient-launcher-unwrapped/disable-bundling.patch
new file mode 100644
index 000000000000..8666b86ddfef
--- /dev/null
+++ b/pkgs/by-name/no/noriskclient-launcher-unwrapped/disable-bundling.patch
@@ -0,0 +1,22 @@
+diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
+index bb58d13..c1046f8 100644
+--- a/src-tauri/tauri.conf.json
++++ b/src-tauri/tauri.conf.json
+@@ -100,7 +100,7 @@
+         }
+       }
+     },
+-    "active": true,
++    "active": false,
+     "targets": ["app", "dmg", "deb", "appimage", "nsis"],
+     "icon": [
+       "icons/32x32.png",
+@@ -109,7 +109,7 @@
+       "icons/icon.icns",
+       "icons/icon.ico"
+     ],
+-    "createUpdaterArtifacts": true,
++    "createUpdaterArtifacts": false,
+     "fileAssociations": [
+       {
+         "ext": ["noriskpack"],
diff --git a/pkgs/by-name/no/noriskclient-launcher-unwrapped/java-from-path.patch b/pkgs/by-name/no/noriskclient-launcher-unwrapped/java-from-path.patch
new file mode 100644
index 000000000000..3403c305ee2c
--- /dev/null
+++ b/pkgs/by-name/no/noriskclient-launcher-unwrapped/java-from-path.patch
@@ -0,0 +1,34 @@
+diff --git a/src-tauri/src/minecraft/downloads/java_download.rs b/src-tauri/src/minecraft/downloads/java_download.rs
+index 25ab9b2..d1af896 100644
+--- a/src-tauri/src/minecraft/downloads/java_download.rs
++++ b/src-tauri/src/minecraft/downloads/java_download.rs
+@@ -9,6 +9,7 @@ use flate2::read::GzDecoder;
+ use futures::future::try_join_all;
+ use log::{debug, error, info};
+ use reqwest;
++use std::env;
+ use std::fs::File;
+ use std::io::Cursor;
+ use std::path::PathBuf;
+@@ -526,6 +527,21 @@ impl JavaDownloadService {
+             ],
+         };
+ 
++        let target = format!("openjdk-{}", version);
++        match env::var_os("PATH") {
++            Some(paths) => {
++                for path in env::split_paths(&paths) {
++                    if let Some(path_str) = path.to_str() {
++                        if path_str.contains(&target) {
++                            debug!("Found Java binary at: {:?}", path);
++                            return Ok(path)
++                        }
++                    }
++                }
++            }
++            none => debug!("PATH is not defined"),
++        }
++
+         // Try all possible paths
+         for java_binary in java_binary_paths {
+             debug!("Checking for Java binary at: {:?}", java_binary);
diff --git a/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix b/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix
new file mode 100644
index 000000000000..b4b8adfbea7c
--- /dev/null
+++ b/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix
@@ -0,0 +1,92 @@
+{
+  cargo-tauri,
+  desktop-file-utils,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  glib,
+  gtk3,
+  libayatana-appindicator,
+  lib,
+  nix-update-script,
+  nodejs,
+  openssl,
+  pkg-config,
+  rustPlatform,
+  webkitgtk_4_1,
+  yarnConfigHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "noriskclient-launcher-unwrapped";
+  version = "0.6.14";
+
+  src = fetchFromGitHub {
+    owner = "NoRiskClient";
+    repo = "noriskclient-launcher";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9UUNIS8r/695maQ2j2+Wj2L5qy55Wfs/MNhKJnwC6GI=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = "${finalAttrs.src}/yarn.lock";
+    hash = "sha256-IWgP4VEyEBNsxALKGMpk8WZCIc76qcEu5K+kYqsdYkQ=";
+  };
+
+  patches = [
+    # The tauri.conf.json is configured to build multiple apps. We don't want that here.
+    ./disable-bundling.patch
+
+    # Make the launcher find java from PATH, instead of downloading its own, which is not going to work on NixOS.
+    ./java-from-path.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
+      --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
+  '';
+
+  cargoHash = "sha256-heSUEW7r9Lt26Fu68Jo/7BHW6Qmp8GrRSavukCS+ySk=";
+
+  cargoRoot = "src-tauri";
+  buildAndTestSubdir = finalAttrs.cargoRoot;
+
+  nativeBuildInputs = [
+    cargo-tauri.hook
+    desktop-file-utils
+    nodejs
+    pkg-config
+    yarnConfigHook
+  ];
+
+  buildInputs = [
+    glib
+    gtk3
+    libayatana-appindicator
+    openssl
+    webkitgtk_4_1
+  ];
+
+  postInstall = ''
+    desktop-file-edit \
+    --set-name "NoRiskClient Launcher" \
+    --set-comment "Launcher for NoRiskClient" \
+    --set-key="Categories" --set-value="Game" \
+    --set-key="Keywords" --set-value="nrc;minecraft;mc;" \
+    $out/share/applications/NoRisk\ Launcher.desktop
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Minecraft Launcher for NoRisk Client";
+    homepage = "https://norisk.gg";
+    license = lib.licenses.gpl3Only;
+    longDescription = ''
+      An easy way to launch the NoRisk Client, create modpacks,
+      manage content for Minecraft, and much more - written in tauri.
+    '';
+    maintainers = with lib.maintainers; [ hythera ];
+    mainProgram = "noriskclient-launcher-v3";
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/no/noriskclient-launcher/package.nix b/pkgs/by-name/no/noriskclient-launcher/package.nix
new file mode 100644
index 000000000000..19dfce8d4c5a
--- /dev/null
+++ b/pkgs/by-name/no/noriskclient-launcher/package.nix
@@ -0,0 +1,101 @@
+{
+  addDriverRunpath,
+  alsa-lib,
+  flite,
+  glib,
+  glib-networking,
+  gsettings-desktop-schemas,
+  jdk17,
+  jdk21,
+  jdk8,
+  jdks ? [
+    jdk8
+    jdk17
+    jdk21
+  ],
+  lib,
+  libGL,
+  libjack2,
+  libpulseaudio,
+  libX11,
+  libXcursor,
+  libXext,
+  libXrandr,
+  libXxf86vm,
+  noriskclient-launcher-unwrapped,
+  pipewire,
+  stdenv,
+  symlinkJoin,
+  udev,
+  wrapGAppsHook4,
+}:
+
+symlinkJoin {
+  pname = "noriskclient-launcher";
+  inherit (noriskclient-launcher-unwrapped) version;
+
+  paths = [ noriskclient-launcher-unwrapped ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    glib
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    glib-networking
+    gsettings-desktop-schemas
+  ];
+
+  runtimeDependencies = lib.optionalString stdenv.hostPlatform.isLinux (
+    lib.makeLibraryPath [
+      addDriverRunpath.driverLink
+
+      # glfw
+      libGL
+      libX11
+      libXcursor
+      libXext
+      libXrandr
+      libXxf86vm
+
+      # narrator support
+      flite
+
+      # openal
+      alsa-lib
+      libjack2
+      libpulseaudio
+      pipewire
+
+      # oshi
+      udev
+    ]
+  );
+
+  postBuild = ''
+    gappsWrapperArgs+=(
+      --prefix PATH : ${lib.makeSearchPath "bin/java" jdks}
+      ${lib.optionalString stdenv.hostPlatform.isLinux ''
+        --set LD_LIBRARY_PATH $runtimeDependencies
+      ''}
+    )
+
+    glibPostInstallHook
+    gappsWrapperArgsHook
+    wrapGAppsHook
+  '';
+
+  meta = {
+    inherit (noriskclient-launcher-unwrapped.meta)
+      description
+      homepage
+      license
+      longDescription
+      maintainers
+      mainProgram
+      platforms
+      ;
+  };
+}
diff --git a/pkgs/by-name/no/notesnook/package.nix b/pkgs/by-name/no/notesnook/package.nix
index 68bbd0dd81ed..ec2fe0b6d99d 100644
--- a/pkgs/by-name/no/notesnook/package.nix
+++ b/pkgs/by-name/no/notesnook/package.nix
@@ -9,7 +9,7 @@
 
 let
   pname = "notesnook";
-  version = "3.2.4";
+  version = "3.3.5";
 
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "Unsupported system: ${system}";
@@ -27,10 +27,10 @@ let
     url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}";
     hash =
       {
-        x86_64-linux = "sha256-n4yDBaDq09idmjRZ+y2zT7rZcI4wsDhMidx9sNox5cM=";
-        aarch64-linux = "sha256-UQFySvvs+paCzt2XSrbYiChEQJIbef3rCOST1r+zZx8=";
-        x86_64-darwin = "sha256-42US8m6ZbGTUNkU0p4y0pgXKiSsjZZHlQhwv2/LDlO4=";
-        aarch64-darwin = "sha256-eJVyuL5nBGMr8WhOK4NOMNSMYBASQZbsbLPLgug7ZNs=";
+        x86_64-linux = "sha256-jvQph74dMQgino3K1ZFLT/fsJVdTHVqMQaW0RQhfci0=";
+        aarch64-linux = "sha256-jrKmZmdx1T1wrlM0y195Z2MsI1XpFn0gyFyf7N/aUzo=";
+        x86_64-darwin = "sha256-bJ+sq6/lZcLcM7R2KAigemdpRDqSiExfcSunNQ7cGw0=";
+        aarch64-darwin = "sha256-DTY0gq62aXOanZvYletyXl5xmcs30vWTKE4nZujRCq0=";
       }
       .${system} or throwSystem;
   };
@@ -52,6 +52,7 @@ let
     maintainers = with lib.maintainers; [
       cig0
       j0lol
+      keysmashes
     ];
     platforms = [
       "x86_64-linux"
diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 628e2e6a0111..52e1b78dee38 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -13,12 +13,12 @@
 }:
 let
   pname = "opencode";
-  version = "1.0.150";
+  version = "1.0.164";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${version}";
-    hash = "sha256-8mFmFFk378g93MbFRwMOJkjuXqq3PVPdCuGVLPn6D44=";
+    hash = "sha256-bz20/y6zVhEWQZB17HocvYg0F9XNwy6EKg3LHSkmvLE=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -70,7 +70,7 @@ let
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-3swARfDhEfLoaucjiUfse3px40ZBfQsEE8DPgUk/5K0=";
+    outputHash = "sha256-I7y6e+ODXShbMCmKOvC48+Y3wyrLKH0IES4S6gOnMiE=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };
@@ -211,6 +211,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     '';
     homepage = "https://github.com/sst/opencode";
     license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ delafthi ];
     platforms = [
       "aarch64-linux"
       "x86_64-linux"
diff --git a/pkgs/by-name/pa/paq/package.nix b/pkgs/by-name/pa/paq/package.nix
index 2468f8b00ac3..72e17b2dd54f 100644
--- a/pkgs/by-name/pa/paq/package.nix
+++ b/pkgs/by-name/pa/paq/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "paq";
-  version = "1.3.3";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "gregl83";
     repo = "paq";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2HlQzb3foNv/F35u7/737eJfNTsiQRCymggKAQ+mIS0=";
+    hash = "sha256-cG1xoe0mtijR5l1T2O/6C6yTdGhSXxYaGGugllOOZoE=";
   };
 
-  cargoHash = "sha256-LlqKdJhmOYnmnZA+xh7sogcnMWgpgm5qV6vwM3n3vng=";
+  cargoHash = "sha256-M3UtXCX4caYYaXoS8F2kKheP5qX5xac2WPNCnw94B6Q=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
diff --git a/pkgs/by-name/pe/penelope/package.nix b/pkgs/by-name/pe/penelope/package.nix
index 312ec68d46fd..4aa5ca554bdf 100644
--- a/pkgs/by-name/pe/penelope/package.nix
+++ b/pkgs/by-name/pe/penelope/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "penelope";
-  version = "0.14.8";
+  version = "0.14.14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "brightio";
     repo = "penelope";
     tag = "v${version}";
-    hash = "sha256-m4EYP1lKte8r9Xa/xAuv6aiwMNha+B8HXUCizH0JgmI=";
+    hash = "sha256-rSZkktq/XtlDV/bHC7ad4uhOzT3cnCxrHX7NH1t9cO0=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix
index 12f7e3e705e7..6dfc66220b0f 100644
--- a/pkgs/by-name/pk/pkgsite/package.nix
+++ b/pkgs/by-name/pk/pkgsite/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule {
   pname = "pkgsite";
-  version = "0-unstable-2025-12-09";
+  version = "0-unstable-2025-12-15";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "7dafa59905aea1f9f4a8d2f38c1505796d9b69b3";
-    hash = "sha256-aNpvU/4FFNDJAn11Js+1I41GjLic6gF8MyJXS3TLeRA=";
+    rev = "4eb0af2c34bf5ae5d7e04cc47cd8f7b6269ef079";
+    hash = "sha256-BpNB8wrb3vR5NXAxwRfrQjwcSllWB1YlQJU25OlS8Hw=";
   };
 
   vendorHash = "sha256-6wgJNDzUzSCkwzjqGwzpa63+0HoN5PapKxMBFBuu16M=";
diff --git a/pkgs/by-name/pl/playball/package.nix b/pkgs/by-name/pl/playball/package.nix
new file mode 100644
index 000000000000..9b074d806476
--- /dev/null
+++ b/pkgs/by-name/pl/playball/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage rec {
+  pname = "playball";
+  version = "3.2.0";
+
+  src = fetchFromGitHub {
+    owner = "paaatrick";
+    repo = "playball";
+    tag = "v${version}";
+    hash = "sha256-xgAhzNWCLNmbrwaYAGmXMercoRgXWPjjV5dcnXunmeA=";
+  };
+
+  npmDepsHash = "sha256-s0JKBJnVYkeXOE62F6BZRKwd0Hg3IOuMai6rmKUi6TI=";
+
+  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+
+  meta = {
+    changelog = "https://github.com/paaatrick/playball/releases/tag/v${version}";
+    description = "Watch MLB games from the comfort of your own terminal";
+    mainProgram = "playball";
+    homepage = "https://github.com/paaatrick/playball";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nickthegroot ];
+  };
+}
diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix
index 4e4c90d5a183..cacb413cb856 100644
--- a/pkgs/by-name/pm/pmbootstrap/package.nix
+++ b/pkgs/by-name/pm/pmbootstrap/package.nix
@@ -15,14 +15,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pmbootstrap";
-  version = "3.6.0";
+  version = "3.7.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "postmarketOS";
     repo = "pmbootstrap";
     tag = version;
-    hash = "sha256-sO042kmozpGbiojkivs4xbYDgVV4nVbiWkfxnbJFOJg=";
+    hash = "sha256-l8y1GoNZd6JeWzO2TI0GIVc/WlMv9EunFGH94pZ7ibk=";
     domain = "gitlab.postmarketos.org";
   };
 
@@ -84,6 +84,7 @@ python3Packages.buildPythonApplication rec {
     maintainers = with lib.maintainers; [
       onny
       lucasew
+      ungeskriptet
     ];
     mainProgram = "pmbootstrap";
   };
diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix
index a8ef71d47183..5090d9dd84ac 100644
--- a/pkgs/by-name/po/podman/package.nix
+++ b/pkgs/by-name/po/podman/package.nix
@@ -12,7 +12,8 @@
   libapparmor,
   libseccomp,
   libselinux,
-  systemdMinimal,
+  # TODO: investigate why changing from `systemd` to `systemdMinimal` breaks `podman logs`
+  systemd,
   nixosTests,
   python3,
   makeBinaryWrapper,
@@ -83,7 +84,7 @@ buildGoModule (finalAttrs: {
     libseccomp
     libselinux
     lvm2
-    systemdMinimal
+    systemd
   ];
 
   env = {
@@ -135,7 +136,7 @@ buildGoModule (finalAttrs: {
 
   postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
     RPATH=$(patchelf --print-rpath $out/bin/.podman-wrapped)
-    patchelf --set-rpath "${lib.makeLibraryPath [ systemdMinimal ]}":$RPATH $out/bin/.podman-wrapped
+    patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped
     substituteInPlace "$out/share/systemd/user/podman-user-wait-network-online.service" \
       --replace-fail sleep '${coreutils}/bin/sleep' \
       --replace-fail /bin/sh '${runtimeShell}'
diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix
index 1a75ac6c5e06..aa67696130c7 100644
--- a/pkgs/by-name/pr/prek/package.nix
+++ b/pkgs/by-name/pr/prek/package.nix
@@ -143,6 +143,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "lua::remote_hook"
     # error message differs
     "run_in_non_git_repo"
+    # depends on locale
+    "init_nonexistent_repo"
   ];
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/pr/prometheus/disable-react-app.diff b/pkgs/by-name/pr/prometheus/disable-react-app.diff
new file mode 100644
index 000000000000..f98eca28554a
--- /dev/null
+++ b/pkgs/by-name/pr/prometheus/disable-react-app.diff
@@ -0,0 +1,10 @@
+--- ./build_ui.sh	2025-10-22 23:32:08.739188520 +0100
++++ ./build_ui.sh	2025-10-22 23:32:23.753242986 +0100
+@@ -50,7 +50,6 @@ for i in "$@"; do
+   case ${i} in
+   --all)
+     buildModule
+-    buildReactApp
+     buildMantineUI
+     shift
+     ;;
diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix
index 7b75b0b7bff7..082dfcc2e044 100644
--- a/pkgs/by-name/pr/prometheus/package.nix
+++ b/pkgs/by-name/pr/prometheus/package.nix
@@ -1,11 +1,10 @@
 {
   stdenv,
-  buildPackages,
   lib,
   go,
   buildGoModule,
+  buildNpmPackage,
   fetchFromGitHub,
-  fetchurl,
   nixosTests,
   enableAWS ? true,
   enableAzure ? true,
@@ -30,11 +29,65 @@
   enableVultr ? true,
   enableXDS ? true,
   enableZookeeper ? true,
+  versionCheckHook,
 }:
 
-buildGoModule (finalAttrs: {
+let
+  source = import ./source.nix;
+
+  inherit (source) version vendorHash;
+
   pname = "prometheus";
-  version = "3.8.0";
+
+  src = fetchFromGitHub {
+    owner = "prometheus";
+    repo = "prometheus";
+    tag = "v${version}";
+    hash = source.hash;
+  };
+
+  assets = buildNpmPackage {
+    pname = "${pname}-assets";
+    inherit version;
+
+    src = "${src}/web/ui";
+
+    npmDepsHash = source.npmDepsHash;
+
+    patches = [
+      # Disable old React app as it depends on deprecated create-react-apps
+      # script
+      ./disable-react-app.diff
+    ];
+
+    env.CI = true;
+
+    doCheck = true;
+    checkPhase = ''
+      runHook preCheck
+
+      npm test
+
+      runHook postCheck
+    '';
+
+    postInstall = ''
+      mkdir -p $out/static
+      cp -r $out/lib/node_modules/prometheus-io/static/* $out/static
+      find $out/static -type f -exec gzip -f9 {} \;
+
+      # Remove node_modules
+      rm -rf $out/lib
+    '';
+  };
+in
+buildGoModule (finalAttrs: {
+  inherit
+    pname
+    version
+    vendorHash
+    src
+    ;
 
   outputs = [
     "out"
@@ -42,22 +95,6 @@ buildGoModule (finalAttrs: {
     "cli"
   ];
 
-  src = fetchFromGitHub {
-    owner = "prometheus";
-    repo = "prometheus";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-hRuZxwPPDLxQvy5MPKEyfmanNabcSjLRO+XbNKugPtk=";
-  };
-
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-
-  vendorHash = "sha256-5wDaG01vcTtGzrS/S33U5XWXoSWM+N9z3dzXZlILxD8=";
-
-  webUiStatic = fetchurl {
-    url = "https://github.com/prometheus/prometheus/releases/download/v${finalAttrs.version}/prometheus-web-ui-${finalAttrs.version}.tar.gz";
-    hash = "sha256-oOEvNZFlYtTNBsn+B2pAWXi0A2oJ6IAo7V8bOLtjfCM=";
-  };
-
   excludedPackages = [
     "documentation/prometheus-mixin"
     "internal/tools"
@@ -65,7 +102,7 @@ buildGoModule (finalAttrs: {
   ];
 
   postPatch = ''
-    tar -C web/ui -xzf ${finalAttrs.webUiStatic}
+    cp -r ${assets}/static web/ui/static/
 
     patchShebangs scripts
 
@@ -99,9 +136,18 @@ buildGoModule (finalAttrs: {
   '';
 
   preBuild = ''
-    if [[ -d vendor ]]; then
-      GOARCH= CC="$CC_FOR_BUILD" LD="$LD_FOR_BUILD" make -o assets assets-compress plugins
-    fi
+    if [[ -d vendor ]]; then GOARCH= make -o assets plugins; fi
+
+    # Recreate the `make assets-compress` target here - workaround permissions
+    # errors
+    cp web/ui/embed.go.tmpl web/ui/embed.go
+
+    find web/ui/static -type f -name '*.gz' -print0 | sort -z | xargs -0 echo //go:embed >> web/ui/embed.go
+
+    echo 'var EmbedFS embed.FS' >> web/ui/embed.go
+
+    # EmbedFS requires relative paths
+    substituteInPlace web/ui/embed.go --replace-fail "web/ui/" ""
   '';
 
   tags = [ "builtinassets" ];
@@ -141,15 +187,26 @@ buildGoModule (finalAttrs: {
     "-skip=TestEvaluations/testdata/aggregators.test"
   ];
 
-  passthru.tests = { inherit (nixosTests) prometheus; };
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru = {
+    tests = { inherit (nixosTests) prometheus; };
+    updateScript = ./update.sh;
+  };
 
   meta = {
     description = "Service monitoring system and time series database";
     homepage = "https://prometheus.io";
     license = lib.licenses.asl20;
+    changelog = "https://github.com/prometheus/prometheus/blob/v${version}/CHANGELOG.md";
     maintainers = with lib.maintainers; [
       fpletz
       Frostman
+      jpds
     ];
     mainProgram = "prometheus";
   };
diff --git a/pkgs/by-name/pr/prometheus/source.nix b/pkgs/by-name/pr/prometheus/source.nix
new file mode 100644
index 000000000000..d112d1e2116c
--- /dev/null
+++ b/pkgs/by-name/pr/prometheus/source.nix
@@ -0,0 +1,6 @@
+{
+  version = "3.8.1";
+  hash = "sha256-mb1aMWpIELyZaqjYX1teYdtAK/+W9jzdPwzgbT7AVj4=";
+  npmDepsHash = "sha256-wmxvlQWQO2gP2apupMJssqAPr1ntWWIazduQU3AuodU=";
+  vendorHash = "sha256-35pVMl1Hu970BQE6jMzT1xaz/3FaIFWUtel0cl/uBdw=";
+}
diff --git a/pkgs/by-name/pr/prometheus/update.sh b/pkgs/by-name/pr/prometheus/update.sh
new file mode 100755
index 000000000000..c09ec3a4064b
--- /dev/null
+++ b/pkgs/by-name/pr/prometheus/update.sh
@@ -0,0 +1,77 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix coreutils curl jq nix-prefetch-git prefetch-npm-deps
+
+set -euo pipefail
+
+OWNER=prometheus
+REPO=prometheus
+
+# Current version.
+LATEST_NIXPKGS_VERSION=$(nix eval --raw .#prometheus.version 2>/dev/null)
+UPDATE_NIX_OLD_VERSION=${UPDATE_NIX_OLD_VERSION:-$LATEST_NIXPKGS_VERSION}
+
+TARGET_TAG="$(curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} "https://api.github.com/repos/$OWNER/$REPO/releases/latest" | jq -r '.tag_name')"
+TARGET_VERSION="$(echo "$TARGET_TAG" | sed -e 's/^v//')"
+
+if [[ "$UPDATE_NIX_OLD_VERSION" == "$TARGET_VERSION" ]]; then
+    # prometheus is up-to-date
+    if [[ -n "$UPDATE_NIX_ATTR_PATH" ]]; then
+        echo "[{}]";
+    fi
+
+    exit 0
+fi
+
+extractVendorHash() {
+    original="${1?original hash missing}"
+    result="$(nix-build -A prometheus.goModules 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)"
+    [ -z "$result" ] && { echo "$original"; } || { echo "$result"; }
+}
+
+TMP=$(mktemp -d)
+trap 'rm -rf "$TMP"' EXIT
+
+NIXPKGS_PROMETHEUS_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/
+SOURCE_NIX="$NIXPKGS_PROMETHEUS_PATH/source.nix"
+
+PREFETCH_JSON=$TMP/prefetch.json
+nix-prefetch-git --rev "$TARGET_TAG" --url "https://github.com/$OWNER/$REPO" > "$PREFETCH_JSON"
+PREFETCH_HASH="$(jq '.hash' -r < "$PREFETCH_JSON")"
+PREFETCH_PATH="$(jq '.path' -r < "$PREFETCH_JSON")"
+NPM_DEPS_HASH="$(prefetch-npm-deps "$PREFETCH_PATH/web/ui/package-lock.json")"
+
+FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+
+cat > "$SOURCE_NIX" <<-EOF
+{
+  version = "$TARGET_VERSION";
+  hash = "$PREFETCH_HASH";
+  npmDepsHash = "$NPM_DEPS_HASH";
+  vendorHash = "$FAKE_HASH";
+}
+EOF
+
+GO_HASH="$(nix-instantiate --eval -A prometheus.vendorHash | tr -d '"')"
+VENDOR_HASH=$(extractVendorHash "$GO_HASH")
+
+cat > "$SOURCE_NIX" <<-EOF
+{
+  version = "$TARGET_VERSION";
+  hash = "$PREFETCH_HASH";
+  npmDepsHash = "$NPM_DEPS_HASH";
+  vendorHash = "$VENDOR_HASH";
+}
+EOF
+
+if [[ -z "$UPDATE_NIX_ATTR_PATH" ]]; then
+    exit 0
+fi
+
+cat <<-EOF
+[{
+  "attrPath": "$UPDATE_NIX_ATTR_PATH",
+  "oldVersion": "$UPDATE_NIX_OLD_VERSION",
+  "newVersion": "$TARGET_VERSION",
+  "files": ["$SOURCE_NIX"]
+}]
+EOF
diff --git a/pkgs/by-name/pr/proxsuite/fix-cmake-python-version.patch b/pkgs/by-name/pr/proxsuite/fix-cmake-python-version.patch
new file mode 100644
index 000000000000..f880f7fb9df4
--- /dev/null
+++ b/pkgs/by-name/pr/proxsuite/fix-cmake-python-version.patch
@@ -0,0 +1,14 @@
+diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
+index 07678691f..1d85e5eb2 100644
+--- a/bindings/python/CMakeLists.txt
++++ b/bindings/python/CMakeLists.txt
+@@ -31,6 +31,9 @@ execute_process(
+   OUTPUT_STRIP_TRAILING_WHITESPACE
+   OUTPUT_VARIABLE nanobind_ROOT
+ )
++if(NOT Python_VERSION AND Python3_VERSION)
++  set(Python_VERSION ${Python3_VERSION})
++endif()
+ find_package(nanobind CONFIG)
+ cmake_policy(POP)
+ if(NOT nanobind_FOUND)
diff --git a/pkgs/by-name/pr/proxsuite/package.nix b/pkgs/by-name/pr/proxsuite/package.nix
index fc56b8ef0e5d..9b7ff3a213e2 100644
--- a/pkgs/by-name/pr/proxsuite/package.nix
+++ b/pkgs/by-name/pr/proxsuite/package.nix
@@ -36,6 +36,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-1+a5tFOlEwzhGZtll35EMFceD0iUOOQCbwJd9NcFDlk=";
   };
 
+  patches = [
+    # Set Python_VERSION to Python3_VERSION if not already set
+    ./fix-cmake-python-version.patch
+  ];
+
   # ref. https://github.com/Simple-Robotics/proxsuite/pull/408 merged upstream
   postPatch = ''
     substituteInPlace CMakeLists.txt --replace-fail \
diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index 0a5caf02380e..d35528ad13c1 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -19,11 +19,11 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "25.12.5";
+  version = "25.12.6";
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-LS1R5+wCkv/IvgC8RMqhvoIrrMmNlS0Hg+IgMViRJys=";
+    hash = "sha256-zlTyh0D7FXB4LDGQXi4Hb8WeujaM7F7hoO9TccZfzFg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix
index fe7701d5447e..8c95154409bd 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.10";
+  version = "0.3.11";
 in
 rustPlatform.buildRustPackage {
   inherit version;
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
     owner = "achristmascarl";
     repo = "rainfrog";
     tag = "v${version}";
-    hash = "sha256-Up/ZjIppQ3EYceSzY8DBV3lK8fd+sylm2Jl7lvO4VdY=";
+    hash = "sha256-NzXVC2frFcExZZEdzIzy6VUPwzd2Xa/xoCPSAaKBHsg=";
   };
 
-  cargoHash = "sha256-PzBvshoVxa4FaSygDPTR0+EuzfmQBkdb64jOWOpAgYY=";
+  cargoHash = "sha256-ZKobMGiBWzj7YQiXfdtja+BN+skjj5wBERHUMYz4H44=";
 
   passthru = {
     tests.version = testers.testVersion {
diff --git a/pkgs/by-name/re/renode/package.nix b/pkgs/by-name/re/renode/package.nix
index cad261b20253..42255102d626 100644
--- a/pkgs/by-name/re/renode/package.nix
+++ b/pkgs/by-name/re/renode/package.nix
@@ -174,6 +174,10 @@ buildDotnetModule rec {
       --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \
   '';
 
+  postFixup = ''
+    mv $out/bin/Renode $out/bin/renode
+  '';
+
   executables = [ "Renode" ];
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/rl/rlwrap/package.nix b/pkgs/by-name/rl/rlwrap/package.nix
index 22187c8cd2ff..ddde37c8bb7a 100644
--- a/pkgs/by-name/rl/rlwrap/package.nix
+++ b/pkgs/by-name/rl/rlwrap/package.nix
@@ -4,18 +4,19 @@
   fetchFromGitHub,
   autoreconfHook,
   perl,
+  libptytty,
   readline,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rlwrap";
-  version = "0.46.2";
+  version = "0.48";
 
   src = fetchFromGitHub {
     owner = "hanslub42";
     repo = "rlwrap";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-05q24Y097GCcipXEPTbel/YIAtQl4jDyA9JFjDDM41Y=";
+    hash = "sha256-Szgyjt/KRFEZMu6JX4Ulm2guTMwh9ejzjlfpkITWOI4=";
   };
 
   nativeBuildInputs = [
@@ -23,14 +24,23 @@ stdenv.mkDerivation (finalAttrs: {
     perl
   ];
 
-  buildInputs = [ readline ];
+  buildInputs = [
+    libptytty
+    readline
+  ];
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-error=implicit-function-declaration";
 
+  # no environment to compile completion.c, update its time to avoid recompiling
+  preBuild = ''
+    touch src/completion.rb
+    touch src/completion.c
+  '';
+
   meta = {
     description = "Readline wrapper for console programs";
     homepage = "https://github.com/hanslub42/rlwrap";
-    changelog = "https://github.com/hanslub42/rlwrap/raw/refs/tags/v${finalAttrs.version}/NEWS";
+    changelog = "https://github.com/hanslub42/rlwrap/raw/${finalAttrs.src.rev}/NEWS";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ jlesquembre ];
diff --git a/pkgs/by-name/ro/ron-lsp/package.nix b/pkgs/by-name/ro/ron-lsp/package.nix
new file mode 100644
index 000000000000..ca2ad1d863db
--- /dev/null
+++ b/pkgs/by-name/ro/ron-lsp/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "ron-lsp";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "jasonjmcghee";
+    repo = "ron-lsp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-c+cJrXINuoK+NR1rMSrOeZqZzrEcg/brSTKSTu5mNr4=";
+  };
+
+  cargoHash = "sha256-eEoxgnfc9s59b0SNozEIj/1wHv+OWDmd4bniBbGsgSQ=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "RON, Rusty Object Notation, Language Server";
+    longDescription = ''
+      An LSP and CLI for RON files that provides autocomplete,
+      diagnostics, go to definition, code actions, and hover support
+      based on Rust type annotations
+    '';
+    homepage = "https://github.com/jasonjmcghee/ron-lsp";
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [
+      Dietr1ch
+    ];
+    mainProgram = "ron-lsp";
+  };
+})
diff --git a/pkgs/by-name/se/setserial/gcc-fixes.patch b/pkgs/by-name/se/setserial/gcc-fixes.patch
new file mode 100644
index 000000000000..c9cc7d1b7eec
--- /dev/null
+++ b/pkgs/by-name/se/setserial/gcc-fixes.patch
@@ -0,0 +1,31 @@
+diff --git a/setserial.c b/setserial.c
+index fef6532768..b7cde26ac2 100644
+--- a/setserial.c
++++ b/setserial.c
+@@ -10,11 +10,14 @@
+  * Last modified: [tytso:19940520.0036EDT]
+  */
+ 
++#include <errno.h>
++#include <fcntl.h>
+ #include <stdio.h>
+-#include <fcntl.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <termios.h>
+-#include <string.h>
+-#include <errno.h>
++#include <unistd.h>
++#include <sys/ioctl.h>
+ 
+ #ifdef HAVE_ASM_IOCTLS_H
+ #include <asm/ioctls.h>
+@@ -714,7 +717,7 @@
+ 	exit(1);
+ }
+ 
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+ 	int	get_flag = 0, wild_intr_flag = 0;
+ 	int	c;
diff --git a/pkgs/by-name/se/setserial/package.nix b/pkgs/by-name/se/setserial/package.nix
new file mode 100644
index 000000000000..ecc662f2ab93
--- /dev/null
+++ b/pkgs/by-name/se/setserial/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  groff,
+  autoreconfHook,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "setserial";
+  version = "2.17";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/setserial/${pname}-${version}.tar.gz";
+    sha256 = "0jkrnn3i8gbsl48k3civjmvxyv9rbm1qjha2cf2macdc439qfi3y";
+  };
+
+  patches = [ ./gcc-fixes.patch ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+    groff
+  ];
+
+  postConfigure = ''
+    substituteInPlace Makefile \
+      --replace-fail /usr/man/ /share/man/ \
+      --replace-fail DESTDIR out
+  '';
+
+  preInstall = ''
+    mkdir -p "$out/bin" "$out/share/man/man8"
+  '';
+
+  meta = {
+    description = "Serial port configuration utility";
+    homepage = "https://setserial.sourceforge.net";
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Only;
+    mainProgram = "setserial";
+    maintainers = [ lib.maintainers.mmlb ];
+  };
+}
diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix
index 541a45c7d424..f194bb5aa0b4 100644
--- a/pkgs/by-name/sh/shader-slang/package.nix
+++ b/pkgs/by-name/sh/shader-slang/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shader-slang";
-  version = "2025.24";
+  version = "2025.24.1";
 
   src = fetchFromGitHub {
     owner = "shader-slang";
     repo = "slang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lOvPEUsweyBIf/ryoCDnwBTkvz4J9xatkNSWDvM8zWc=";
+    hash = "sha256-w99pRi03HyI8xlvxbJL+i5k6Sr0ITkh28qB9nRY2iiU=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix
index 8075deacb417..d352d6d571fd 100644
--- a/pkgs/by-name/si/sirius/package.nix
+++ b/pkgs/by-name/si/sirius/package.nix
@@ -53,13 +53,13 @@ assert enablePython -> pythonPackages != null;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "SIRIUS";
-  version = "7.9.0";
+  version = "7.10.0";
 
   src = fetchFromGitHub {
     owner = "electronic-structure";
     repo = "SIRIUS";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/bhY+LCxOikS1at0ONFAhmvfnWhAVHsRQ4GfXJOZbBA=";
+    hash = "sha256-cq4ajtAJXfIH1B866FYhgROMSwd7nsbXf/6kbSwJAso=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/sl/slack/sources.nix b/pkgs/by-name/sl/slack/sources.nix
index 7071e28703d2..ec2f086eb4e0 100644
--- a/pkgs/by-name/sl/slack/sources.nix
+++ b/pkgs/by-name/sl/slack/sources.nix
@@ -1,26 +1,26 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2025-11-14
+# Last updated: 2025-12-15
 { fetchurl }:
 {
   aarch64-darwin = {
-    version = "4.47.59";
+    version = "4.47.72";
     src = fetchurl {
-      url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.47.59/Slack-4.47.59-macOS.dmg";
-      hash = "sha256-q6rNYr2wCN/a50fCZMxNiM2R7PKC+DBxJ5KJy9Wnb/Y=";
+      url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.47.72/Slack-4.47.72-macOS.dmg";
+      hash = "sha256-AihMQAjMMRWJftQOp9gnIC/df8nnrKnkpRym8sdtUkA=";
     };
   };
   x86_64-darwin = {
-    version = "4.47.59";
+    version = "4.47.72";
     src = fetchurl {
-      url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.47.59/Slack-4.47.59-macOS.dmg";
-      hash = "sha256-CIESzdXIHeDelIos7ZW9Z2/mnrltk7o92oqS1yM2MnY=";
+      url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.47.72/Slack-4.47.72-macOS.dmg";
+      hash = "sha256-H1Dqtlqz1FxDqq4iAZJsTkugLp+WVU9fKB+H19l+vug=";
     };
   };
   x86_64-linux = {
-    version = "4.47.59";
+    version = "4.47.72";
     src = fetchurl {
-      url = "https://downloads.slack-edge.com/desktop-releases/linux/x64/4.47.59/slack-desktop-4.47.59-amd64.deb";
-      hash = "sha256-R+WmtvIw6FLqsskG/hOdEdwZgsCZwWprGhbE7/Xpr1s=";
+      url = "https://downloads.slack-edge.com/desktop-releases/linux/x64/4.47.72/slack-desktop-4.47.72-amd64.deb";
+      hash = "sha256-o1WOTBG5u4jL+NGbTEZq+afM2UwUJZ0gtsWKsnsOkvE=";
     };
   };
 }
diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix
index 31fe69b8c7ac..b4d163e4626f 100644
--- a/pkgs/by-name/su/super-productivity/package.nix
+++ b/pkgs/by-name/su/super-productivity/package.nix
@@ -1,7 +1,7 @@
 {
   buildNpmPackage,
   copyDesktopItems,
-  electron,
+  electron_37,
   fetchFromGitHub,
   lib,
   makeDesktopItem,
@@ -11,16 +11,18 @@
   rsync,
   stdenv,
 }:
-
+let
+  electron = electron_37;
+in
 buildNpmPackage rec {
   pname = "super-productivity";
-  version = "16.5.0";
+  version = "16.5.5";
 
   src = fetchFromGitHub {
     owner = "johannesjo";
     repo = "super-productivity";
     tag = "v${version}";
-    hash = "sha256-FBquRpn+g5wOwvM62MqL7RZ41LXer0CskVN5+5mD9kM=";
+    hash = "sha256-0V68wkkuyOFcv4Wl2Kqk4Soa/nOB7CizelYyI0TKU+8=";
 
     postFetch = ''
       find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \;
@@ -63,7 +65,7 @@ buildNpmPackage rec {
       dontInstall = true;
 
       outputHashMode = "recursive";
-      hash = "sha256-r0xlODXi4+C+Aat3e3goMIBvBordes/KVlsBG696ZWs=";
+      hash = "sha256-gsGzwwzt54Ww9CyHaHVAM4v1mHM2vQePw5vM8x1EGao=";
     }
   );
 
@@ -168,6 +170,7 @@ buildNpmPackage rec {
     maintainers = with lib.maintainers; [
       offline
       pineapplehunter
+      tebriel
     ];
     mainProgram = "super-productivity";
   };
diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix
index 13c0ef10cebe..68d0801be970 100644
--- a/pkgs/by-name/te/television/package.nix
+++ b/pkgs/by-name/te/television/package.nix
@@ -19,16 +19,16 @@ let
   television = rustPlatform.buildRustPackage (finalAttrs: {
     pname = "television";
 
-    version = "0.13.12";
+    version = "0.14.0";
 
     src = fetchFromGitHub {
       owner = "alexpasmantier";
       repo = "television";
       tag = finalAttrs.version;
-      hash = "sha256-zAaTVKSE0OBcrpg/XKXC8aY3NXawe9RbC4i6pPJK1Nw=";
+      hash = "sha256-3xzgLG4iHd4SvBgMu3MgpOPD0saVDaC8gXy+Y/wJ4q4=";
     };
 
-    cargoHash = "sha256-ZUaaVVGZzxVDPltZ4B5UHQFU7lyuzRzoQ/2upwS7njQ=";
+    cargoHash = "sha256-3Ttar63EffTmU4pnwgZb/Zl9zIN9T9hAcV/uFUjypeQ=";
 
     strictDeps = true;
     nativeBuildInputs = [
diff --git a/pkgs/by-name/ti/timidity/package.nix b/pkgs/by-name/ti/timidity/package.nix
index 73300dfa3cd5..1d26190c5b52 100644
--- a/pkgs/by-name/ti/timidity/package.nix
+++ b/pkgs/by-name/ti/timidity/package.nix
@@ -99,6 +99,9 @@ stdenv.mkDerivation rec {
     sed -i 's/^\(calcnewt\$(EXEEXT):\).*/\1/g' timidity/Makefile
   '';
 
+  # Fix build with gcc15
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   # the instruments could be compressed (?)
   postInstall = ''
     mkdir -p $out/share/timidity/;
diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix
index 28f5c0c75db0..90c2282f89b9 100644
--- a/pkgs/by-name/to/topgrade/package.nix
+++ b/pkgs/by-name/to/topgrade/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "topgrade";
-  version = "16.6.1";
+  version = "16.7.0";
 
   src = fetchFromGitHub {
     owner = "topgrade-rs";
     repo = "topgrade";
     tag = "v${version}";
-    hash = "sha256-HOMCk88PrngnrBUGw3cBo8ZEh2Qez/+fmuK1I+tTevc=";
+    hash = "sha256-1RbOb8YW17g+iqd/jbN5fZBBJmUgvefrm+b8zwpvMJg=";
   };
 
-  cargoHash = "sha256-+aH73WsAuE1BWWJo12X7dCF54uXG452ITonWfp16vWY=";
+  cargoHash = "sha256-naObSjHmUpx6JyjLt16xT+c4qeCtRDkJhSdcgIA8pBU=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/tu/tun2proxy/package.nix b/pkgs/by-name/tu/tun2proxy/package.nix
index dbe08f101647..3454f9bdedb0 100644
--- a/pkgs/by-name/tu/tun2proxy/package.nix
+++ b/pkgs/by-name/tu/tun2proxy/package.nix
@@ -1,7 +1,9 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchCrate,
+  rust-cbindgen,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -18,6 +20,32 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   env.GIT_HASH = "000000000000000000000000000000000000000000000000000";
 
+  nativeBuildInputs = [ rust-cbindgen ];
+
+  outputs = [
+    "out"
+    "dev"
+    "lib"
+  ];
+
+  postBuild = ''
+    cbindgen --config cbindgen.toml -o target/tun2proxy.h
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D target/${stdenv.hostPlatform.rust.rustcTarget}/release/tun2proxy-bin -t $out/bin
+    install -D target/${stdenv.hostPlatform.rust.rustcTarget}/release/udpgw-server -t $out/bin
+
+    install -D target/tun2proxy.h -t $dev/include
+
+    install -D target/${stdenv.hostPlatform.rust.rustcTarget}/release/libtun2proxy.a -t $lib/lib
+    install -D target/${stdenv.hostPlatform.rust.rustcTarget}/release/libtun2proxy${stdenv.hostPlatform.extensions.library} -t $lib/lib
+
+    runHook postInstall
+  '';
+
   meta = {
     homepage = "https://github.com/tun2proxy/tun2proxy";
     description = "Tunnel (TUN) interface for SOCKS and HTTP proxies";
diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix
index 6f02940521cf..d8329901eff8 100644
--- a/pkgs/by-name/ty/ty/package.nix
+++ b/pkgs/by-name/ty/ty/package.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ty";
-  version = "0.0.1-alpha.35";
+  version = "0.0.2";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ty";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-dx6zZnThnkQHQbi5SXkKCnpkfw2kcrRDg0QEvb4WBqk=";
+    hash = "sha256-4Kv3UUn2QbOOOaQ/uzJB2KOUx++Gb+cKpZg4kGx99Q0=";
   };
 
   # For Darwin platforms, remove the integration test for file notifications,
@@ -81,7 +81,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   );
 
   passthru = {
-    updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; };
+    updateScript = nix-update-script { };
   };
 
   meta = {
diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 69e9b5281be0..532cdee531dc 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.9.17";
+  version = "0.9.18";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-DY/D2t1O2vsFisc3FR97A9oNic9wjxVnYWiAqQR3FwI=";
+    hash = "sha256-hef79QdqCgK0oni4wZVVJzyEkqTob7ek9l6GazbmygY=";
   };
 
-  cargoHash = "sha256-cXr529d/PDLeFCwEo06vxfw9JkPjfhYB8MG2oqiGZUw=";
+  cargoHash = "sha256-ulbznI3qQDrzPircibC7xdEwCk/OVsFQW5lCYWrjfkg=";
 
   buildInputs = [
     rust-jemalloc-sys
diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix
index 36f5a85f4da3..9c15e9e9f788 100644
--- a/pkgs/by-name/ve/vector/package.nix
+++ b/pkgs/by-name/ve/vector/package.nix
@@ -26,16 +26,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "vector";
-  version = "0.51.1";
+  version = "0.52.0";
 
   src = fetchFromGitHub {
     owner = "vectordotdev";
     repo = "vector";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EjG8FFz4PDAgCPTkHAxJieW+t6RAPx3MTSku8QGXjYg=";
+    hash = "sha256-jwEJ+myovZYcohvxH1VvvOW8xok3HSLvhtMsLC2M3KY=";
   };
 
-  cargoHash = "sha256-17hmdom7ZZQQ4vYte3IKZnqlLEv7D7LY6tyWqdeuUHk=";
+  cargoHash = "sha256-EfgDL5asygFqr8pVcTR9BsYU3fcG28xhrCn5nCkVfcA=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/vo/volanta/package.nix b/pkgs/by-name/vo/volanta/package.nix
index 946fe77f2512..1977daa247e7 100644
--- a/pkgs/by-name/vo/volanta/package.nix
+++ b/pkgs/by-name/vo/volanta/package.nix
@@ -9,11 +9,11 @@
 }:
 let
   pname = "volanta";
-  version = "1.14.3";
-  build = "4881d864";
+  version = "1.15.0";
+  build = "1240645b";
   src = fetchurl {
     url = "https://cdn.volanta.app/software/volanta-app/${version}-${build}/volanta-${version}.AppImage";
-    hash = "sha256-Rn/0GQSUbp7sG0EG9LlBLgaBRR+vP+C1TVpGnsi8QpY=";
+    hash = "sha256-6QF9o5BFeGZBjpusFMYrWlnYhAdItfxg+gS0Xf2q7io=";
   };
   appImageContents = appimageTools.extract { inherit pname version src; };
 in
diff --git a/pkgs/by-name/wa/watchgha/package.nix b/pkgs/by-name/wa/watchgha/package.nix
index ac87868e3033..5d8ac59d53b7 100644
--- a/pkgs/by-name/wa/watchgha/package.nix
+++ b/pkgs/by-name/wa/watchgha/package.nix
@@ -5,13 +5,13 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "watchgha";
-  version = "2.4.2";
+  version = "2.5.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "watchgha";
-    hash = "sha256-RtmCC+twOk+viWY7WTbTzuxHTM3MOww+sRuEvlemCcI=";
+    hash = "sha256-jjQk/X9kd8qhqgvivSIsvg0BOp6zh6yqpPiAS6ak/Ps=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix
index 4201668ee1bb..649b01b2470f 100644
--- a/pkgs/by-name/we/wechat/package.nix
+++ b/pkgs/by-name/we/wechat/package.nix
@@ -30,14 +30,14 @@ let
       # https://dldir1.qq.com/weixin/mac/mac-release.xml
       any-darwin =
         let
-          version = "4.1.5.26-32281";
+          version = "4.1.6.11-33044";
           version' = lib.replaceString "-" "_" version;
         in
         {
           inherit version;
           src = fetchurl {
             url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
-            hash = "sha256-hiq6L51w0ToQrmB0Lq3HrcMdwrPpVIy+ePMP899JRfg=";
+            hash = "sha256-A9K5NvBaQev0PXPlwbGmS6nMhbDNI5S+NMhYHaLhcLo=";
           };
         };
     in
diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix
index c7dc146bbf62..f3d6be777469 100644
--- a/pkgs/by-name/xh/xh/package.nix
+++ b/pkgs/by-name/xh/xh/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xh";
-  version = "0.25.0";
+  version = "0.25.3";
 
   src = fetchFromGitHub {
     owner = "ducaale";
     repo = "xh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UuWNLsJAoSjDPs/8VzW2vics3A/nsXWR5xmjMqTmYvQ=";
+    hash = "sha256-WRYClBIjw67lVrzvnIMqVHd6toi5yU7nClViqfXahKA=";
   };
 
-  cargoHash = "sha256-SsJSBkOdQSpbEbFPK+qscSBePUKMLM1UpajpvpR2ZEo=";
+  cargoHash = "sha256-T2ZaijWXyH8ZJKFTTngGtQsdRWL9re4i3nKHp8srWSI=";
 
   buildFeatures = lib.optional withNativeTls "native-tls";
 
diff --git a/pkgs/by-name/xn/xnviewmp/package.nix b/pkgs/by-name/xn/xnviewmp/package.nix
index 895c6f39b58c..a581c999df3c 100644
--- a/pkgs/by-name/xn/xnviewmp/package.nix
+++ b/pkgs/by-name/xn/xnviewmp/package.nix
@@ -25,11 +25,11 @@ let
 in
 appimageTools.wrapType2 rec {
   pname = "xnviewmp";
-  version = "1.9.7";
+  version = "1.9.8";
 
   src = fetchurl {
     url = "https://download.xnview.com/old_versions/XnView_MP/XnView_MP-${version}.glibc2.17-x86_64.AppImage";
-    hash = "sha256-PUV46AmzFBtBh361dS84rtZM5N7mKBG9aLkoyvz16R0=";
+    hash = "sha256-BO5gFVy2rKqK8Xwtvh9ZNY2XRgc/+ewNFUkKlFqK1KA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/za/zap/package.nix b/pkgs/by-name/za/zap/package.nix
index 5dbf70e3a184..09eb0d8aca0a 100644
--- a/pkgs/by-name/za/zap/package.nix
+++ b/pkgs/by-name/za/zap/package.nix
@@ -10,10 +10,10 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zap";
-  version = "2.16.1";
+  version = "2.17.0";
   src = fetchurl {
     url = "https://github.com/zaproxy/zaproxy/releases/download/v${finalAttrs.version}/ZAP_${finalAttrs.version}_Linux.tar.gz";
-    hash = "sha256-Wy64MZsIUSGm6K1Q1p1n2++MhnFm9xqTe/yIjSR6KsE=";
+    hash = "sha256-7+eZqqNifbaDtD8AycIQrqC3XADMjwoPBDTRK7Pd3lo=";
   };
 
   desktopItems = [
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 49459c74b12f..050abc5a7cf3 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -106,7 +106,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.216.1";
+  version = "0.217.1";
 
   outputs = [
     "out"
@@ -119,7 +119,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7rLrPXnPvKTE4w9FYs4RHSs3wBbmwbaWtTdvC2iC6yY=";
+    hash = "sha256-4A2uiHeqnvJF1lLzUQsTMZ30v7iWp8MZTla5R1/AVFg=";
   };
 
   postPatch = ''
@@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm -r $out/git/*/candle-book/
   '';
 
-  cargoHash = "sha256-cnjLwoes71/M0vMB01dLBB7pujlVHT82hfQxwr/Z4XQ=";
+  cargoHash = "sha256-OsIau0R00zHWvaepXDyU3JMrMJUQbHdoYAilG95lvp4=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/ze/zerofs/package.nix b/pkgs/by-name/ze/zerofs/package.nix
index c54af266ea04..58e0d57bfb80 100644
--- a/pkgs/by-name/ze/zerofs/package.nix
+++ b/pkgs/by-name/ze/zerofs/package.nix
@@ -11,18 +11,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zerofs";
-  version = "0.22.1";
+  version = "0.22.4";
 
   src = fetchFromGitHub {
     owner = "Barre";
     repo = "ZeroFS";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YdqZV8TdodSKP3h2Qa0+Xi7bfGKrtGq625Oco+UjIpU=";
+    hash = "sha256-17KYkB5TtD+JYXhLVj09gcvETlpG1yC/U2Ql04Ur57g=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/zerofs";
 
-  cargoHash = "sha256-rPa8XmApLClhJ2oAQxEoQL2Hd+8QlJAOZVw+kzS70KY=";
+  cargoHash = "sha256-5Yn4aaYo34NnwSnZ5kVPMe0xfkvu9fGk9OHje9q1oLw=";
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix
index 8d427429671f..029b5c62cfe7 100644
--- a/pkgs/by-name/zw/zwave-js-ui/package.nix
+++ b/pkgs/by-name/zw/zwave-js-ui/package.nix
@@ -7,15 +7,15 @@
 
 buildNpmPackage rec {
   pname = "zwave-js-ui";
-  version = "11.8.2";
+  version = "11.9.0";
 
   src = fetchFromGitHub {
     owner = "zwave-js";
     repo = "zwave-js-ui";
     tag = "v${version}";
-    hash = "sha256-OXvdj8DzaVK+5YmFh56FToB43OOOh7+7JZvmW7IQkKE=";
+    hash = "sha256-rUrpmjmcVfWY4Z6d7MvLKTxaog3NH5ieEbxVvma2ALI=";
   };
-  npmDepsHash = "sha256-388Iu0rDFNIk3FUy2/TySejgR6sFWc/9BP19KEmfQKk=";
+  npmDepsHash = "sha256-Q7FjXLMl14caowfofShhm5It7cCMxI255ahXebsG8u0=";
 
   passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
 
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 1e2ec624894d..750ceec2b0e1 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kotlin";
-  version = "2.2.21";
+  version = "2.3.0";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${finalAttrs.version}/kotlin-compiler-${finalAttrs.version}.zip";
-    sha256 = "sha256-piOHHxzZyTiUaUi3DvkXCHnwdYBDiFu9MMMvAk5RFxQ=";
+    sha256 = "sha256-6harHKsp1Bm/QbYOzA4wXUSfpmHZwF+8xbKmZyUFRWo=";
   };
 
   propagatedBuildInputs = [ jre ];
diff --git a/pkgs/development/interpreters/python/pypy/darwin_version_min.patch b/pkgs/development/interpreters/python/pypy/darwin_version_min.patch
new file mode 100644
index 000000000000..18b5726ce13d
--- /dev/null
+++ b/pkgs/development/interpreters/python/pypy/darwin_version_min.patch
@@ -0,0 +1,19 @@
+diff --git a/rpython/translator/platform/darwin.py b/rpython/translator/platform/darwin.py
+index 8c824a8459..f407fb6c07 100644
+--- a/rpython/translator/platform/darwin.py
++++ b/rpython/translator/platform/darwin.py
+@@ -26,12 +26,12 @@ class Darwin(posix.BasePosix):
+     standalone_only = ('-mdynamic-no-pic',)
+     shared_only = ()
+ 
+-    link_flags = (DARWIN_VERSION_MIN,)
++    link_flags = ()
+     cflags = ('-O3',
+               '-fomit-frame-pointer',
+               # The parser turns 'const char *const *includes' into 'const const char **includes'
+               '-Wno-duplicate-decl-specifier',
+-              DARWIN_VERSION_MIN,)
++              )
+ 
+     so_ext = 'dylib'
+     DEFAULT_CC = 'clang'
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index 727e76b7fd7a..bfe766fc2917 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -171,6 +171,11 @@ stdenv.mkDerivation rec {
       inherit (sqlite) out dev;
       libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}";
     })
+
+    # PyPy sets an explicit minimum SDK version for darwin that is much older
+    # than what we default to on nixpkgs.
+    # Simply removing the explicit flag makes it use our default instead.
+    ./darwin_version_min.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/development/ocaml-modules/extunix/default.nix b/pkgs/development/ocaml-modules/extunix/default.nix
index da2bc782a2a1..5cc8a576abe3 100644
--- a/pkgs/development/ocaml-modules/extunix/default.nix
+++ b/pkgs/development/ocaml-modules/extunix/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildDunePackage,
-  fetchFromGitHub,
+  fetchurl,
   dune-configurator,
   ppxlib,
 }:
@@ -10,11 +10,11 @@ buildDunePackage (finalAttrs: {
   pname = "extunix";
   version = "0.4.4";
 
-  src = fetchFromGitHub {
-    owner = "ygrek";
-    repo = "extunix";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-7wJDGv19etkDHRwwQ+WONtJswxNMjr2Q2Vhis4WgFek=";
+  minimalOCamlVersion = "5.3.0";
+
+  src = fetchurl {
+    url = "https://github.com/ygrek/extunix/releases/download/v${finalAttrs.version}/extunix-${finalAttrs.version}.tbz";
+    hash = "sha256-kzTIkjFiI+aK73lcpystQp1O7Apkf0GLA142oFPRSX0=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index ad25c0f35d81..a900ee4a7372 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "43.2.1";
+  version = "43.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "aioesphomeapi";
     tag = "v${version}";
-    hash = "sha256-OUmnamtVCMobTI99aRr81MECG51JHfzQ9bZs0C1Mmcw=";
+    hash = "sha256-x6X1iqTrmBfPA6/gy/qBIUYtr0jv0hPO26pWaONAV3c=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix
index 77f6c6d32695..9ff76054b794 100644
--- a/pkgs/development/python-modules/async-upnp-client/default.nix
+++ b/pkgs/development/python-modules/async-upnp-client/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "async-upnp-client";
-  version = "0.46.0";
+  version = "0.46.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "StevenLooman";
     repo = "async_upnp_client";
     tag = version;
-    hash = "sha256-M8ctS8TvYS01fWfAIKkOMMmp3+FzJLB7Eq+weS2EqI4=";
+    hash = "sha256-Ez7UnZjSA0JYrqY5SV4q9myrbXCQzg/plrQ9P941b6E=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index b33d2451f55d..fc8f98bcc955 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.42.10";
+  version = "1.42.11";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-Xw9tCzwwyE+z0aL8P8uusre/GTKb3qn2KHy9Du/TOgc=";
+    hash = "sha256-nb7AAYT3Abn7vy81VKuWtc2L0YVL91mdGRfGWdSI+GQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 3787868050c2..91a0df6969d3 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.42.10";
+  version = "1.42.11";
   pyproject = true;
 
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-6G/LDWdVVZtxRIExaFTRmmtLmTAjYH2kfVagx11Pk4c=";
+    hash = "sha256-wrrJINjDAuFea+yVk9rq8Ed3cU+DCf4FL9JM8o64WnY=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix
index d460f9ea9510..b581156b473f 100644
--- a/pkgs/development/python-modules/disposable-email-domains/default.nix
+++ b/pkgs/development/python-modules/disposable-email-domains/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "disposable-email-domains";
-  version = "0.0.152";
+  version = "0.0.153";
   pyproject = true;
 
   # No tags on GitHub
   src = fetchPypi {
     pname = "disposable_email_domains";
     inherit version;
-    hash = "sha256-5F3ZC9tZ1cpX6qTvDm74bTEJQRYWEn1+QI0d04Yry8M=";
+    hash = "sha256-b4C/OKBMR48lJ5+e1Mx7PJO2ZvITvar213qYkrFnmV0=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/drf-pydantic/default.nix b/pkgs/development/python-modules/drf-pydantic/default.nix
index 2be1211baed3..826a1b2ebe3b 100644
--- a/pkgs/development/python-modules/drf-pydantic/default.nix
+++ b/pkgs/development/python-modules/drf-pydantic/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "drf-pydantic";
-  version = "2.9.0";
+  version = "2.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "georgebv";
     repo = "drf-pydantic";
     tag = "v${version}";
-    hash = "sha256-RvDTequtxHyCsXV8IpNWdYNzdjkKEr8aAyS3ZFZTW1A=";
+    hash = "sha256-/dMhKlAMAh63JlhanfSfe15ECMZvtnd1huD8L3Xo2AQ=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/edge-tts/default.nix b/pkgs/development/python-modules/edge-tts/default.nix
index f6f3c8c23f2a..50d048eb161d 100644
--- a/pkgs/development/python-modules/edge-tts/default.nix
+++ b/pkgs/development/python-modules/edge-tts/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "edge-tts";
-  version = "7.2.3";
+  version = "7.2.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rany2";
     repo = "edge-tts";
     tag = version;
-    hash = "sha256-JnwfvSa60oEbSEyD6q88Ey6IyGOwVWO0T75VrUKZmos=";
+    hash = "sha256-KlQJ9U5RgifpqVKw5BrPwBFJYZHKibMUlyb3aX+4qf8=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/extra-streamlit-components/default.nix b/pkgs/development/python-modules/extra-streamlit-components/default.nix
new file mode 100644
index 000000000000..c3a5a1d7ab9e
--- /dev/null
+++ b/pkgs/development/python-modules/extra-streamlit-components/default.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  streamlit,
+}:
+
+buildPythonPackage rec {
+  pname = "extra-streamlit-components";
+  version = "0.1.81";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "extra_streamlit_components";
+    inherit version;
+    hash = "sha256-65vre6z+iz0jjxiIohx4rGz6VpNBvkhLygjD6gsV8g0=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ streamlit ];
+
+  pythonImportsCheck = [ "extra_streamlit_components" ];
+
+  # Module has no tests
+  doCheck = false;
+
+  meta = {
+    description = "Additional components for streamlit";
+    homepage = "https://pypi.org/project/extra-streamlit-components/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix
index 5d0c383549be..448a05333f71 100644
--- a/pkgs/development/python-modules/fastcore/default.nix
+++ b/pkgs/development/python-modules/fastcore/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "fastcore";
-  version = "1.8.17";
+  version = "1.9.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fastai";
     repo = "fastcore";
     tag = version;
-    hash = "sha256-RugbfTqgoM+GWswxjYL3vpLdEifGCDaUI7McfQ/mpZ8=";
+    hash = "sha256-78zqQ8M0XZ6QcaH+6gw4IJDLk9d1WxjPiCr6puY/srM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix
index 9adcb87f8ee8..056d326d93c3 100644
--- a/pkgs/development/python-modules/hoomd-blue/default.nix
+++ b/pkgs/development/python-modules/hoomd-blue/default.nix
@@ -1,69 +1,70 @@
 {
   lib,
   buildPythonPackage,
-  fetchgit,
   cmake,
+  eigen,
+  fetchFromGitHub,
+  mpi,
   pkgconfig,
   python,
-  mpi ? null,
+  # true or false to enable/disable; null to use upstream defaults
+  withHpmc ? null,
+  withMd ? null,
+  withMetal ? null,
+  withMpcd ? null,
 }:
 
 let
-  components = {
-    cgcmm = true;
-    depreciated = true;
-    hpmc = true;
-    md = true;
-    metal = true;
-  };
-  onOffBool = b: if b then "ON" else "OFF";
-  withMPI = (mpi != null);
+  optionalCmakeBool = name: value: lib.optionals (value != null) [ (lib.cmakeBool name value) ];
 in
 buildPythonPackage rec {
-  version = "2.3.4";
+  version = "6.0.0";
   pname = "hoomd-blue";
   pyproject = false; # Built with cmake
 
-  src = fetchgit {
-    url = "https://bitbucket.org/glotzer/hoomd-blue";
-    rev = "v${version}";
-    sha256 = "0in49f1dvah33nl5n2qqbssfynb31pw1ds07j8ziryk9w252j1al";
-  };
-
-  passthru = {
-    inherit components mpi;
+  src = fetchFromGitHub {
+    owner = "glotzerlab";
+    repo = "hoomd-blue";
+    tag = "v${version}";
+    hash = "sha256-dmDBAJU6FxMQXuMO+nE1yzOY1m6/x43eH3USBQNVu8A=";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [
     cmake
     pkgconfig
   ];
-  buildInputs = lib.optionals withMPI [ mpi ];
-  propagatedBuildInputs = [ python.pkgs.numpy ] ++ lib.optionals withMPI [ python.pkgs.mpi4py ];
+  buildInputs = [
+    eigen
+    mpi
+  ];
+
+  dependencies = with python.pkgs; [
+    numpy
+    mpi4py
+    pybind11
+  ];
 
   dontAddPrefix = true;
   cmakeFlags = [
-    "-DENABLE_MPI=${onOffBool withMPI}"
-    "-DBUILD_CGCMM=${onOffBool components.cgcmm}"
-    "-DBUILD_DEPRECIATED=${onOffBool components.depreciated}"
-    "-DBUILD_HPMC=${onOffBool components.hpmc}"
-    "-DBUILD_MD=${onOffBool components.md}"
-    "-DBUILD_METAL=${onOffBool components.metal}"
-    "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/${python.sitePackages}"
-  ];
+    (lib.cmakeBool "BUILD_TESTING" doCheck)
+    (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/${python.sitePackages}")
+  ]
+  ++ optionalCmakeBool "BUILD_MD" withMd
+  ++ optionalCmakeBool "BUILD_HPMC" withHpmc
+  ++ optionalCmakeBool "BUILD_METAL" withMetal
+  ++ optionalCmakeBool "BUILD_MPCD" withMpcd;
 
-  # tests fail but have tested that package runs properly
-  doCheck = false;
-  checkTarget = "test";
+  # Tests are performed as part of the installPhase when -DBUILD_TESTING=TRUE,
+  # not the checkPhase or installCheckPhase.
+  # But leave doCheck here so people can override it as they may expect.
+  doCheck = true;
 
   meta = {
-    homepage = "http://glotzerlab.engin.umich.edu/hoomd-blue/";
+    homepage = "https://glotzerlab.engin.umich.edu/software/";
     description = "HOOMD-blue is a general-purpose particle simulation toolkit";
-    license = lib.licenses.bsdOriginal;
-    platforms = [ "x86_64-linux" ];
+    changelog = "https://github.com/glotzerlab/hoomd-blue/blob/${src.tag}/CHANGELOG.rst";
+    license = lib.licenses.bsd3;
     maintainers = [ ];
-    # Has compilation errors since some dependencies got updated, will probably
-    # be fixed if updated by itself to the latest version.
-    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 4b75bc47a760..601f6f392aac 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202512161";
+  version = "0.1.202512171";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-i8eNsCX56h0PrJm3Qd4TzSPAVoK5Un0W5AH2eMOXH68=";
+    hash = "sha256-VQ97KOd05h1CYTSi554jVrKPtiDN6IAqnq86qHvULdI=";
   };
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix
index 08223acd1b79..7830ba09d1b5 100644
--- a/pkgs/development/python-modules/ihm/default.nix
+++ b/pkgs/development/python-modules/ihm/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "ihm";
-  version = "2.7";
+  version = "2.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ihmwg";
     repo = "python-ihm";
     tag = version;
-    hash = "sha256-ZMHVYuNcUjhMKJUr5bCIELO6F0CNi0ESfbsBm5vOiA4=";
+    hash = "sha256-sT2wZRKyW+N0gd6xwOAEXImMnWKWq8h9UX1b3qkDLGQ=";
   };
 
   nativeBuildInputs = [ swig ];
diff --git a/pkgs/development/python-modules/lance-namespace/default.nix b/pkgs/development/python-modules/lance-namespace/default.nix
index cc70c285605f..e57b95a944c1 100644
--- a/pkgs/development/python-modules/lance-namespace/default.nix
+++ b/pkgs/development/python-modules/lance-namespace/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "lance-namespace";
-  version = "0.2.1";
+  version = "0.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance-namespace";
     tag = "v${version}";
-    hash = "sha256-1SCsKjFd//1y28eR5MC2/M7cIMTRa083iDyuvWxLekw=";
+    hash = "sha256-tBInz9BEl6u7E8cAmtlHBqIG65kifPR+iv5/jNV3204=";
   };
 
   sourceRoot = "${src.name}/python/lance_namespace";
diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix
index e43d3e2559c0..429a16ba0e5f 100644
--- a/pkgs/development/python-modules/millheater/default.nix
+++ b/pkgs/development/python-modules/millheater/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "millheater";
-  version = "0.14.1";
+  version = "0.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "pymill";
     tag = version;
-    hash = "sha256-CDPk3AiLFNOovjNi4fDy91BBcxpbyFV9FCN1uU5bxbc=";
+    hash = "sha256-7Jqk5WarCA/YBpmFuF4/dbWpQHtKKRH8hYRT2FXn2n8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix
index eb7b05c0a5fc..c34d10d1a880 100644
--- a/pkgs/development/python-modules/mwparserfromhell/default.nix
+++ b/pkgs/development/python-modules/mwparserfromhell/default.nix
@@ -1,21 +1,22 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
+  setuptools,
+  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "mwparserfromhell";
   version = "0.7.2";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-9Bkwcunqk7noj3cvYKAhJcBgLTKJDQu9yyde1YyLN2M=";
+  src = fetchFromGitHub {
+    owner = "earwig";
+    repo = "mwparserfromhell";
+    tag = "v${version}";
+    hash = "sha256-yPj272bMh/pLapc7lDgP4+AnDBpE2FrDICRUxizIcSA=";
   };
 
   postPatch = ''
@@ -23,14 +24,20 @@ buildPythonPackage rec {
       --replace '"pytest-runner"' ""
   '';
 
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "mwparserfromhell" ];
 
   meta = {
-    description = "MWParserFromHell is a parser for MediaWiki wikicode";
+    description = "Parser for MediaWiki wikicode";
     homepage = "https://mwparserfromhell.readthedocs.io/";
-    changelog = "https://github.com/earwig/mwparserfromhell/releases/tag/v${version}";
+    changelog = "https://github.com/earwig/mwparserfromhell/releases/tag/${src.tag}";
     license = lib.licenses.mit;
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 99be0f822546..49000086bde2 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -633,8 +633,8 @@ in
       "sha256-rXXlHFkPI9DeMO2j+a0kLrieNt73t8//2UnUM2JskfI=";
 
   mypy-boto3-iot =
-    buildMypyBoto3Package "iot" "1.42.3"
-      "sha256-PRDFJ9sJAwbBndd8NNwWyadEEX6HFSPJ1yaMw9KzXVU=";
+    buildMypyBoto3Package "iot" "1.42.11"
+      "sha256-tYIcS9H15aIWVt/dfGtBQGuQIAZbva6zDyrlT8Yytbc=";
 
   mypy-boto3-iot-data =
     buildMypyBoto3Package "iot-data" "1.42.3"
diff --git a/pkgs/development/python-modules/nanobind/default.nix b/pkgs/development/python-modules/nanobind/default.nix
index 3537e9f99356..4c4dd56d8745 100644
--- a/pkgs/development/python-modules/nanobind/default.nix
+++ b/pkgs/development/python-modules/nanobind/default.nix
@@ -26,7 +26,7 @@
 }:
 buildPythonPackage rec {
   pname = "nanobind";
-  version = "2.9.2";
+  version = "2.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     repo = "nanobind";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-cC+sf2FUm1jdGMRdDoaQK8rjUVkWjn/53c1HQ5gsUWs=";
+    hash = "sha256-LNr3d0ytnkcJOps6DzdZtyiihFwNgv34s5RJsRBD844=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/publicsuffix/default.nix b/pkgs/development/python-modules/publicsuffix/default.nix
index b3cb03d01858..94a460a99332 100644
--- a/pkgs/development/python-modules/publicsuffix/default.nix
+++ b/pkgs/development/python-modules/publicsuffix/default.nix
@@ -4,6 +4,7 @@
   fetchPypi,
   setuptools,
   pythonOlder,
+  publicsuffix-list,
 }:
 
 buildPythonPackage rec {
@@ -22,6 +23,9 @@ buildPythonPackage rec {
   postPatch = ''
     sed -i -e "/def test_fetch/i\\
     \\t@unittest.skip('requires internet')" -e "/def additional_tests():/,+1d" tests.py
+
+    rm publicsuffix/public_suffix_list.dat
+    ln -s ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat publicsuffix/public_suffix_list.dat
   '';
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/publicsuffix2/default.nix b/pkgs/development/python-modules/publicsuffix2/default.nix
index 227fab9e1ee5..0732ff4c9794 100644
--- a/pkgs/development/python-modules/publicsuffix2/default.nix
+++ b/pkgs/development/python-modules/publicsuffix2/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
+  publicsuffix-list,
 }:
 let
   tagVersion = "2.2019-12-21";
@@ -27,6 +28,9 @@ buildPythonPackage {
     # only used to update the interal publicsuffix list
     substituteInPlace setup.py \
       --replace "'requests >= 2.7.0'," ""
+
+    rm src/publicsuffix2/public_suffix_list.dat
+    ln -s ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat src/publicsuffix2/public_suffix_list.dat
   '';
 
   pythonImportsCheck = [ "publicsuffix2" ];
diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 16732c89b875..48391b04b586 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -6,6 +6,7 @@
   pytestCheckHook,
   requests,
   setuptools,
+  publicsuffix-list,
 }:
 
 buildPythonPackage rec {
@@ -18,6 +19,11 @@ buildPythonPackage rec {
     hash = "sha256-37hj0A37m8BxNAWWIpRoromnXWJUbqvOOOu9iw01DKk=";
   };
 
+  postPatch = ''
+    rm publicsuffixlist/public_suffix_list.dat
+    ln -s ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat publicsuffixlist/public_suffix_list.dat
+  '';
+
   build-system = [ setuptools ];
 
   optional-dependencies = {
diff --git a/pkgs/development/python-modules/pypoolstation/default.nix b/pkgs/development/python-modules/pypoolstation/default.nix
index 670e6e28af2a..59edbf93e407 100644
--- a/pkgs/development/python-modules/pypoolstation/default.nix
+++ b/pkgs/development/python-modules/pypoolstation/default.nix
@@ -6,24 +6,21 @@
   fetchPypi,
   importlib-metadata,
   poetry-core,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "pypoolstation";
-  version = "0.5.7";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
+  version = "0.5.8";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hSlEChNjoDToA0tgWQiusBEpL08SMuOeHRr9W7Qgh/U=";
+    hash = "sha256-GIRx66esht82tKBJDhCDrwPkxsdBPi1w9tSQ7itF0qQ=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     backoff
     importlib-metadata
diff --git a/pkgs/development/python-modules/pywikibot/default.nix b/pkgs/development/python-modules/pywikibot/default.nix
index 503a6d6309ca..dccccb13fa05 100644
--- a/pkgs/development/python-modules/pywikibot/default.nix
+++ b/pkgs/development/python-modules/pywikibot/default.nix
@@ -5,22 +5,22 @@
   mwparserfromhell,
   requests,
   packaging,
-  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pywikibot";
-  version = "10.7.3";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.8";
+  version = "10.7.4";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ujkPgXqq5h4vISeUXHKWnMR2Mtt0a26Qjz20qdufT/4=";
+    hash = "sha256-/hHfZRLoEgaPKZLus9x/d5O62GnwU/1A7PAsebGj634=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     mwparserfromhell
     requests
     packaging
diff --git a/pkgs/development/python-modules/qnap-qsw/default.nix b/pkgs/development/python-modules/qnap-qsw/default.nix
deleted file mode 100644
index 70a683335ed9..000000000000
--- a/pkgs/development/python-modules/qnap-qsw/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pythonOlder,
-  requests,
-}:
-
-buildPythonPackage rec {
-  pname = "qnap-qsw";
-  version = "0.3.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.9";
-
-  src = fetchFromGitHub {
-    owner = "Noltari";
-    repo = "python-qnap-qsw";
-    rev = version;
-    sha256 = "WP1bGt7aAtSVFOMJgPXKqVSbi5zj9K7qoIVrYCrPGqk=";
-  };
-
-  propagatedBuildInputs = [ requests ];
-
-  # Project has no tests
-  doCheck = false;
-
-  pythonImportsCheck = [ "qnap_qsw" ];
-
-  meta = {
-    description = "Python library to interact with the QNAP QSW API";
-    homepage = "https://github.com/Noltari/python-qnap-qsw";
-    license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/development/python-modules/sectxt/default.nix b/pkgs/development/python-modules/sectxt/default.nix
index 1ca20dd90db4..42dad0d8aad1 100644
--- a/pkgs/development/python-modules/sectxt/default.nix
+++ b/pkgs/development/python-modules/sectxt/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
-  pythonOlder,
   requests,
   python-dateutil,
   langcodes,
@@ -15,16 +14,14 @@
 
 buildPythonPackage rec {
   pname = "sectxt";
-  version = "0.9.7";
+  version = "0.9.8";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "DigitalTrustCenter";
     repo = "sectxt";
     tag = version;
-    hash = "sha256-CDVfT3ANb4ugLEvrSRTbkZMvZA6rcEwBu2c3pnjsza8=";
+    hash = "sha256-x8HcERUZpOijTEXbbtnG0Co5PiQlO4v5bxKM4CAExnI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/streamlit-avatar/default.nix b/pkgs/development/python-modules/streamlit-avatar/default.nix
new file mode 100644
index 000000000000..b8e61ffefbd8
--- /dev/null
+++ b/pkgs/development/python-modules/streamlit-avatar/default.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  streamlit,
+}:
+
+buildPythonPackage rec {
+  pname = "streamlit-avatar";
+  version = "0.1.3";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "streamlit_avatar";
+    inherit version;
+    hash = "sha256-AjiTvYDbWpI9OX/GTSfHqXIQfaTwvqD+uZoy+TY/JpE=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ streamlit ];
+
+  pythonImportsCheck = [ "streamlit_avatar" ];
+
+  # Module has no tests
+  doCheck = false;
+
+  meta = {
+    description = "Component to display avatar icon in Streamlit";
+    homepage = "https://pypi.org/project/streamlit-avatar/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/streamlit-folium/default.nix b/pkgs/development/python-modules/streamlit-folium/default.nix
new file mode 100644
index 000000000000..8500ba9beedd
--- /dev/null
+++ b/pkgs/development/python-modules/streamlit-folium/default.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  branca,
+  buildPythonPackage,
+  fetchFromGitHub,
+  folium,
+  jinja2,
+  pytest-playwright,
+  pytest-rerunfailures,
+  pytestCheckHook,
+  streamlit,
+  uv-build,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "streamlit-folium";
+  version = "0.25.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "randyzwitch";
+    repo = "streamlit-folium";
+    tag = "v${version}";
+    hash = "sha256-ACllvlT2zPyV7IS00LVgnf2u5jMChVJlDgNlWk0c9fo=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.8.4,<0.9" "uv_build"
+  '';
+
+  build-system = [ uv-build ];
+
+  dependencies = [
+    branca
+    folium
+    jinja2
+    streamlit
+  ];
+
+  nativeCheckInputs = [
+    pytest-playwright
+    pytest-rerunfailures
+    pytestCheckHook
+    streamlit
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "streamlit_folium" ];
+
+  preCheck = ''
+    export PATH="$PATH:$out/bin";
+  '';
+
+  disabledTestPaths = [
+    # Don't run tests that require chromium
+    "tests/test_frontend.py"
+  ];
+
+  meta = {
+    description = "Streamlit Component for rendering Folium maps";
+    homepage = "https://github.com/randyzwitch/streamlit-folium";
+    changelog = "https://github.com/randyzwitch/streamlit-folium/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/streamlit-notify/default.nix b/pkgs/development/python-modules/streamlit-notify/default.nix
new file mode 100644
index 000000000000..309cf41d09dd
--- /dev/null
+++ b/pkgs/development/python-modules/streamlit-notify/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  packaging,
+  pytestCheckHook,
+  setuptools,
+  streamlit,
+}:
+
+buildPythonPackage rec {
+  pname = "streamlit-notify";
+  version = "0.3.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pgarrett-scripps";
+    repo = "Streamlit_Notify";
+    tag = "v${version}";
+    hash = "sha256-MI+8fh7aKk7kOVxq3677cVWsiMmE0NSXWukN+Bc0noM=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    packaging
+    streamlit
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "streamlit_notify" ];
+
+  meta = {
+    description = "Queues and displays Streamlit Status Elements notifications";
+    homepage = "https://github.com/pgarrett-scripps/Streamlit_Notify";
+    changelog = "https://github.com/pgarrett-scripps/Streamlit_Notify/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 70b5d7187c18..9a7d00ee58b4 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.1.12";
+  version = "3.1.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-rLAsDXmQ4gmGJctfcOhp+0u6dd6f+u6dTuAGH28QJs8=";
+    hash = "sha256-FGRoef5KloVuBlgBF2t4fyo1+cP5865oOrBZRoy2kQg=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/tracing/default.nix b/pkgs/development/python-modules/tracing/default.nix
deleted file mode 100644
index 5628f0cfd5a6..000000000000
--- a/pkgs/development/python-modules/tracing/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchurl,
-  sphinx,
-}:
-
-buildPythonPackage rec {
-  pname = "tracing";
-  version = "0.8";
-  format = "setuptools";
-
-  src = fetchurl {
-    url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_${version}.orig.tar.gz";
-    sha256 = "1l4ybj5rvrrcxf8csyq7qx52izybd502pmx70zxp46gxqm60d2l0";
-  };
-
-  buildInputs = [ sphinx ];
-
-  # error: invalid command 'test'
-  doCheck = false;
-
-  meta = {
-    homepage = "https://liw.fi/tracing/";
-    description = "Python debug logging helper";
-    license = lib.licenses.gpl3;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/python-modules/tree-sitter-grammars/default.nix b/pkgs/development/python-modules/tree-sitter-grammars/default.nix
index 8abe7bae8221..4bf53a9e134a 100644
--- a/pkgs/development/python-modules/tree-sitter-grammars/default.nix
+++ b/pkgs/development/python-modules/tree-sitter-grammars/default.nix
@@ -12,8 +12,20 @@
   grammarDrv,
 }:
 let
-  inherit (grammarDrv) version;
-
+  # Map nix style `0-unstable-YYYY-MM-DD` version identifiers to a PEP 440
+  # compatible form (`0+unstableYYYYMMDD`).
+  version = lib.pipe grammarDrv [
+    lib.getVersion
+    (lib.splitString "-")
+    (
+      parts:
+      let
+        version = lib.head parts;
+        metadata = lib.join "" (lib.tail parts);
+      in
+      if (metadata == "") then version else "${version}+${metadata}"
+    )
+  ];
   snakeCaseName = lib.replaceStrings [ "-" ] [ "_" ] name;
   drvPrefix = "python-${name}";
   # If the name of the grammar attribute differs from the grammar's symbol name,
diff --git a/pkgs/development/python-modules/unstructured-client/default.nix b/pkgs/development/python-modules/unstructured-client/default.nix
index 90aeb49d74db..9779300c4200 100644
--- a/pkgs/development/python-modules/unstructured-client/default.nix
+++ b/pkgs/development/python-modules/unstructured-client/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "unstructured-client";
-  version = "0.42.4";
+  version = "0.42.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Unstructured-IO";
     repo = "unstructured-python-client";
     tag = "v${version}";
-    hash = "sha256-gSUjv6LghlrSkwFxUqrnFeSSL5V7ryxI0IPRWkEGZ84=";
+    hash = "sha256-BLzWdiDLY4VTeaZnbaleUYSHR9bs62pnos6jJpzHzIg=";
   };
 
   preBuild = ''
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 309e3abe5792..c6b337734e08 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -364,8 +364,8 @@ rec {
   # https://docs.gradle.org/current/userguide/compatibility.html
 
   gradle_9 = mkGradle {
-    version = "9.1.0";
-    hash = "sha256-oX3dhaJran9d23H/iwX8UQTAICxuZHgkKXkMkzaGyAY=";
+    version = "9.2.1";
+    hash = "sha256-cvRMn468sa9Dg49F7lxKqcVESJizRoqz9K97YHbFvD8=";
     defaultJava = jdk21;
   };
   gradle_8 = mkGradle {
diff --git a/pkgs/development/tools/parsing/tree-sitter/build-grammar.nix b/pkgs/development/tools/parsing/tree-sitter/build-grammar.nix
new file mode 100644
index 000000000000..dbbc8bcb83eb
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/build-grammar.nix
@@ -0,0 +1,118 @@
+{
+  stdenv,
+  nodejs,
+  tree-sitter,
+  jq,
+  lib,
+}:
+
+{
+  language,
+  version,
+  src,
+  generate ? false,
+  ...
+}@args:
+
+stdenv.mkDerivation (
+  {
+    pname = "tree-sitter-${language}";
+
+    inherit version src;
+
+    nativeBuildInputs = [
+      jq
+    ]
+    ++ lib.optionals generate [
+      nodejs
+      tree-sitter
+    ];
+
+    CFLAGS = [
+      "-Isrc"
+      "-O2"
+    ];
+    CXXFLAGS = [
+      "-Isrc"
+      "-O2"
+    ];
+
+    stripDebugList = [ "parser" ];
+
+    # Tree-sitter grammar packages contain a `tree-sitter.json` file at their
+    # root. This provides package metadata that can be used to infer build
+    # details.
+    #
+    # See https://tree-sitter.github.io/tree-sitter/cli/init.html for spec.
+    configurePhase = ''
+      runHook preConfigure
+      if [[ -e tree-sitter.json ]]; then
+        # Check nix package version matches grammar source
+        NIX_VERSION=${lib.head (lib.splitString "+" version)}
+        SRC_VERSION=$(jq -r '.metadata.version' tree-sitter.json)
+        if [[ "$NIX_VERSION" != "$SRC_VERSION" ]]; then
+          nixErrorLog "grammar version ($NIX_VERSION) differs from source ($SRC_VERSION)"
+        fi
+
+        # Check language name matches source
+        GRAMMAR=$(jq -c 'first(.grammars[] | select(.name == env.language))' tree-sitter.json)
+        if [[ -z "$GRAMMAR" ]]; then
+          GRAMMAR=$(jq -c 'first(.grammars[]) // {}' tree-sitter.json)
+          NAME=$(jq -r '.name' <<< "$GRAMMAR")
+          SRC_LANGS=$(jq -r '[.grammars[].name] | join(", ")' tree-sitter.json)
+          nixErrorLog "grammar name ($language) not found in source grammars ($SRC_LANGS), continuing with $NAME"
+        fi
+
+        # Move to the appropriate working directory for build
+        cd -- $(jq -r '.path // "."' <<< $GRAMMAR)
+      else
+        # Older grammars may not contain this file. The tree-sitter CLI provides
+        # a warning rather than fail unless ABI > 14. Mirror that behaviour
+        # while older grammars age out.
+        nixWarnLog "grammar source is missing tree-sitter.json"
+      fi
+      runHook postConfigure
+    '';
+
+    # Optionally regenerate the parser source from the defined grammar. In most
+    # cases this should not be required as convention is to have this checked
+    # in to the source repo.
+    preBuild = lib.optionalString generate ''
+      tree-sitter generate
+    '';
+
+    # When both scanner.{c,cc} exist, we should not link both since they may be the same but in
+    # different languages. Just randomly prefer C++ if that happens.
+    buildPhase = ''
+      runHook preBuild
+      if [[ -e src/scanner.cc ]]; then
+        $CXX -fPIC -c src/scanner.cc -o scanner.o $CXXFLAGS
+      elif [[ -e src/scanner.c ]]; then
+        $CC -fPIC -c src/scanner.c -o scanner.o $CFLAGS
+      fi
+      $CC -fPIC -c src/parser.c -o parser.o $CFLAGS
+      rm -rf parser
+      $CXX -shared -o parser *.o
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      mkdir $out
+      mv parser $out/
+      if [[ -d queries ]]; then
+        cp -r queries $out
+      fi
+      runHook postInstall
+    '';
+  }
+  # FIXME: neovim and nvim-treesitter currently rely on passing location rather
+  # than a src attribute with a correctly positioned root (e.g. for grammars in
+  # monorepos). Use this if present for now.
+  // (lib.optionalAttrs (args ? location && args.location != null) {
+    setSourceRoot = "sourceRoot=$(echo */${args.location})";
+  })
+  // removeAttrs args [
+    "generate"
+  ]
+)
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index 69f72f57d4e2..4a41328452a5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -1,8 +1,9 @@
 {
   lib,
   stdenv,
-  fetchgit,
   fetchFromGitHub,
+  fetchFromGitLab,
+  fetchFromSourcehut,
   nix-update-script,
   runCommand,
   which,
@@ -18,122 +19,55 @@
   enableShared ? !stdenv.hostPlatform.isStatic,
   enableStatic ? stdenv.hostPlatform.isStatic,
   webUISupport ? false,
-  extraGrammars ? { },
 
   # tests
   lunarvim,
 }:
 
 let
-  # to update:
-  # 1) change all these hashes
-  # 2) nix-build -A tree-sitter.updater.update-all-grammars
-  # 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions)
-  # 4) run the ./result script that is output by that (it updates ./grammars)
-  version = "0.25.10";
-  hash = "sha256-aHszbvLCLqCwAS4F4UmM3wbSb81QuG9FM7BDHTu1ZvM=";
+  /**
+    Build a parser grammar and put the resulting shared object in `$out/parser`.
 
-  src = fetchFromGitHub {
-    owner = "tree-sitter";
-    repo = "tree-sitter";
-    tag = "v${version}";
-    inherit hash;
-    fetchSubmodules = true;
+    # Example
+
+    ```nix
+    tree-sitter-foo = pkgs.tree-sitter.buildGrammar {
+      language = "foo";
+      version = "0.42.0";
+      src = fetchFromGitHub { ... };
+    };
+    ```
+  */
+  buildGrammar = callPackage ./build-grammar.nix { };
+
+  /**
+    Attrset of grammar sources.
+
+    Values are of the form { language, version, src }. These may be referenced
+    directly by other areas of the tree-sitter ecosystem in nixpkgs. Src will
+    contain all language bindings provided by the upstream grammar.
+
+    Use pkgs.tree-sitter.grammars.<name> to access.
+  */
+  grammars = import ./grammars {
+    inherit
+      lib
+      nix-update-script
+      fetchFromGitHub
+      fetchFromGitLab
+      fetchFromSourcehut
+      ;
   };
 
-  update-all-grammars = callPackage ./update.nix { };
+  /**
+    Attrset of compiled grammars.
 
-  fetchGrammar =
-    v:
-    fetchgit {
-      inherit (v)
-        url
-        rev
-        sha256
-        fetchSubmodules
-        ;
-    };
+    Compiled grammars contain the pre-built shared library and any queries from
+    the grammar source.
 
-  grammars = runCommand "grammars" { } (
-    ''
-      mkdir $out
-    ''
-    + (lib.concatStrings (
-      lib.mapAttrsToList (
-        name: grammar: "ln -s ${grammar.src or (fetchGrammar grammar)} $out/${name}\n"
-      ) (import ./grammars { inherit lib; })
-    ))
-  );
-
-  buildGrammar = callPackage ./grammar.nix { };
-
-  builtGrammars =
-    let
-      build =
-        name: grammar:
-        buildGrammar {
-          language = grammar.language or name;
-          inherit version;
-          src = grammar.src or (fetchGrammar grammar);
-          location = grammar.location or null;
-          generate = grammar.generate or false;
-        };
-      grammars' = import ./grammars { inherit lib; } // extraGrammars;
-      grammars =
-        grammars'
-        // {
-          tree-sitter-latex = grammars'.tree-sitter-latex // {
-            generate = true;
-          };
-        }
-        // {
-          tree-sitter-ocaml = grammars'.tree-sitter-ocaml // {
-            location = "grammars/ocaml";
-          };
-        }
-        // {
-          tree-sitter-ocaml-interface = grammars'.tree-sitter-ocaml // {
-            location = "grammars/interface";
-          };
-        }
-        // {
-          tree-sitter-org-nvim = grammars'.tree-sitter-org-nvim // {
-            language = "tree-sitter-org";
-          };
-        }
-        // {
-          tree-sitter-typescript = grammars'.tree-sitter-typescript // {
-            location = "typescript";
-          };
-        }
-        // {
-          tree-sitter-tsx = grammars'.tree-sitter-typescript // {
-            location = "tsx";
-          };
-        }
-        // {
-          tree-sitter-markdown = grammars'.tree-sitter-markdown // {
-            location = "tree-sitter-markdown";
-          };
-        }
-        // {
-          tree-sitter-markdown-inline = grammars'.tree-sitter-markdown // {
-            language = "tree-sitter-markdown_inline";
-            location = "tree-sitter-markdown-inline";
-          };
-        }
-        // {
-          tree-sitter-php = grammars'.tree-sitter-php // {
-            location = "php";
-          };
-        }
-        // {
-          tree-sitter-sql = grammars'.tree-sitter-sql // {
-            generate = true;
-          };
-        };
-    in
-    lib.mapAttrs build grammars;
+    Use pkgs.tree-sitter-grammars.<name> to access.
+  */
+  builtGrammars = lib.mapAttrs (_: lib.makeOverridable buildGrammar) grammars;
 
   # Usage:
   # pkgs.tree-sitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ])
@@ -167,9 +101,17 @@ let
   allGrammars = builtins.attrValues builtGrammars;
 
 in
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (final: {
   pname = "tree-sitter";
-  inherit src version;
+  version = "0.25.10";
+
+  src = fetchFromGitHub {
+    owner = "tree-sitter";
+    repo = "tree-sitter";
+    tag = "v${final.version}";
+    hash = "sha256-aHszbvLCLqCwAS4F4UmM3wbSb81QuG9FM7BDHTu1ZvM=";
+    fetchSubmodules = true;
+  };
 
   cargoHash = "sha256-4R5Y9yancbg/w3PhACtsWq0+gieUd2j8YnmEj/5eqkg=";
 
@@ -229,9 +171,6 @@ rustPlatform.buildRustPackage {
   doCheck = false;
 
   passthru = {
-    updater = {
-      inherit update-all-grammars;
-    };
     inherit
       grammars
       buildGrammar
@@ -254,7 +193,7 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/tree-sitter/tree-sitter";
     description = "Parser generator tool and an incremental parsing library";
     mainProgram = "tree-sitter";
-    changelog = "https://github.com/tree-sitter/tree-sitter/releases/tag/v${version}";
+    changelog = "https://github.com/tree-sitter/tree-sitter/releases/tag/v${final.version}";
     longDescription = ''
       Tree-sitter is a parser generator tool and an incremental parsing library.
       It can build a concrete syntax tree for a source file and efficiently update the syntax tree as the source file is edited.
@@ -273,4 +212,4 @@ rustPlatform.buildRustPackage {
       amaanq
     ];
   };
-}
+})
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/pkgs/development/tools/parsing/tree-sitter/grammar.nix
deleted file mode 100644
index 9989975b018c..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammar.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  stdenv,
-  nodejs,
-  tree-sitter,
-  lib,
-}:
-
-# Build a parser grammar and put the resulting shared object in `$out/parser`
-
-{
-  # language name
-  language,
-  version,
-  src,
-  location ? null,
-  generate ? false,
-  ...
-}@args:
-
-stdenv.mkDerivation (
-  {
-    pname = "${language}-grammar";
-
-    inherit src version;
-
-    nativeBuildInputs = lib.optionals generate [
-      nodejs
-      tree-sitter
-    ];
-
-    CFLAGS = [
-      "-Isrc"
-      "-O2"
-    ];
-    CXXFLAGS = [
-      "-Isrc"
-      "-O2"
-    ];
-
-    stripDebugList = [ "parser" ];
-
-    configurePhase =
-      lib.optionalString (location != null) ''
-        cd ${location}
-      ''
-      + lib.optionalString generate ''
-        tree-sitter generate
-      '';
-
-    # When both scanner.{c,cc} exist, we should not link both since they may be the same but in
-    # different languages. Just randomly prefer C++ if that happens.
-    buildPhase = ''
-      runHook preBuild
-      if [[ -e src/scanner.cc ]]; then
-        $CXX -fPIC -c src/scanner.cc -o scanner.o $CXXFLAGS
-      elif [[ -e src/scanner.c ]]; then
-        $CC -fPIC -c src/scanner.c -o scanner.o $CFLAGS
-      fi
-      $CC -fPIC -c src/parser.c -o parser.o $CFLAGS
-      rm -rf parser
-      $CXX -shared -o parser *.o
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-      mkdir $out
-      mv parser $out/
-      if [[ -d queries ]]; then
-        cp -r queries $out
-      fi
-      runHook postInstall
-    '';
-  }
-  // removeAttrs args [
-    "language"
-    "location"
-    "generate"
-  ]
-)
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/README.md b/pkgs/development/tools/parsing/tree-sitter/grammars/README.md
new file mode 100644
index 000000000000..623763cccbad
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/README.md
@@ -0,0 +1,126 @@
+# Tree-sitter Grammars
+
+Use [grammar-sources.nix](grammar-sources.nix) to define tree-sitter grammars sources.
+
+Tree-sitter grammars follow a common form for compatibility with the [`tree-sitter` CLI](https://tree-sitter.github.io/tree-sitter/cli/index.html).
+This uniformity enables consistent packaging through shared tooling.
+
+## Adding a Grammar
+
+To declare a new package, map the language name to a set of metadata required for the build.
+At a minimum, this must include the `version` and `src`.
+
+You may use a shorthand [flakeref](https://nix.dev/manual/nix/2.24/command-ref/new-cli/nix3-flake#url-like-syntax) style `url` and `hash` for concise declarations.
+If the hash is not yet known, use a [fake hash placeholder](https://nixos.org/manual/nixpkgs/stable/#sec-pkgs-fetchers-updating-source-hashes).
+
+```nix
+{
+  latex = {
+    version = "0.42.0";
+    url = "github:vandelay-industries/tree-sitter-latex";
+    hash = "";
+  };
+}
+```
+
+This will expand to an element in `pkgs.tree-sitter.grammars` at build time:
+
+```nix
+{
+  tree-sitter-latex = {
+    language = "latex";
+    version = "0.42.0";
+    src = fetchFromGitHub {
+      owner = "vandelay-industries";
+      repo = "tree-sitter-latex";
+      ref = "v0.42.0";
+      hash = "";
+    };
+  };
+}
+```
+
+Each entry is passed to [buildGrammar](../build-grammar.nix), which in turn populates `pkgs.tree-sitter-grammars`.
+
+Attempt to build the new grammar: `nix-build -A tree-sitter-grammars.tree-sitter-latex`.
+This will fail due to the invalid hash.
+Review the downloaded source then update the source definition with the printed source `hash`.
+
+## Pinning Grammar Sources
+
+To pin to a specific ref, append this to the source `url` to override the default version tag.
+
+```nix
+{
+  latex = {
+    version = "0.42.0";
+    url = "github:vandelay-industries/tree-sitter-latex/ccfd77db0ed799b6c22c214fe9d2937f47bc8b34";
+    hash = "";
+  };
+}
+```
+
+This may be either a commit hash or tag.
+
+## Supported sources
+
+The `url` field supports the following prefixes:
+
+- `github:` → uses `fetchFromGitHub`
+- `gitlab:` → uses `fetchFromGitLab`
+- `sourcehut:` → uses `fetchFromSourcehut`
+
+To use [other fetchers](https://nixos.org/manual/nixpkgs/unstable/#chap-pkgs-fetchers), specify the `src` attribute directly:
+
+```nix
+{
+  foolang = {
+    version = "0.42.0";
+    src = fetchtorrent {
+      config = {
+        peer-limit-global = 100;
+      };
+      url = "magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c";
+      hash = "";
+    };
+  };
+}
+```
+
+## Modifying Build Behaviour
+
+Additional attributes in the grammar definition are forwarded to `buildGrammar`, and then to `mkDerivation`.
+This includes build-related flags and metadata.
+
+```nix
+{
+  foolang = {
+    version = "1729.0.0";
+    url = "sourcehut:~example/tree-sitter-foolang";
+    hash = "";
+    generate = true;
+    meta = {
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [
+        kimburgess
+      ];
+    };
+  };
+}
+```
+
+## Updating
+
+All grammar sources have a default update script defined.
+To manually trigger an update of a specific grammar definition:
+
+```shell
+nix-shell maintainers/scripts/update.nix --argstr package tree-sitter-grammars.tree-sitter-${name}
+```
+
+Or, to update all grammars:
+
+```shell
+nix-shell maintainers/scripts/update.nix --argstr path tree-sitter-grammars --argstr keep-going true
+```
+
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index a83fbbb29621..c61bb8046e91 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -1,129 +1,94 @@
-{ lib }:
 {
-  tree-sitter-bash = lib.importJSON ./tree-sitter-bash.json;
-  tree-sitter-beancount = lib.importJSON ./tree-sitter-beancount.json;
-  tree-sitter-bibtex = lib.importJSON ./tree-sitter-bibtex.json;
-  tree-sitter-bitbake = lib.importJSON ./tree-sitter-bitbake.json;
-  tree-sitter-bqn = lib.importJSON ./tree-sitter-bqn.json;
-  tree-sitter-c = lib.importJSON ./tree-sitter-c.json;
-  tree-sitter-c-sharp = lib.importJSON ./tree-sitter-c-sharp.json;
-  tree-sitter-clojure = lib.importJSON ./tree-sitter-clojure.json;
-  tree-sitter-cmake = lib.importJSON ./tree-sitter-cmake.json;
-  tree-sitter-comment = lib.importJSON ./tree-sitter-comment.json;
-  tree-sitter-commonlisp = lib.importJSON ./tree-sitter-commonlisp.json;
-  tree-sitter-cpp = lib.importJSON ./tree-sitter-cpp.json;
-  tree-sitter-crystal = lib.importJSON ./tree-sitter-crystal.json;
-  tree-sitter-css = lib.importJSON ./tree-sitter-css.json;
-  tree-sitter-cuda = lib.importJSON ./tree-sitter-cuda.json;
-  tree-sitter-cue = lib.importJSON ./tree-sitter-cue.json;
-  tree-sitter-dart = lib.importJSON ./tree-sitter-dart.json;
-  tree-sitter-devicetree = lib.importJSON ./tree-sitter-devicetree.json;
-  tree-sitter-dockerfile = lib.importJSON ./tree-sitter-dockerfile.json;
-  tree-sitter-dot = lib.importJSON ./tree-sitter-dot.json;
-  tree-sitter-earthfile = lib.importJSON ./tree-sitter-earthfile.json;
-  tree-sitter-eex = lib.importJSON ./tree-sitter-eex.json;
-  tree-sitter-elisp = lib.importJSON ./tree-sitter-elisp.json;
-  tree-sitter-elixir = lib.importJSON ./tree-sitter-elixir.json;
-  tree-sitter-elm = lib.importJSON ./tree-sitter-elm.json;
-  tree-sitter-embedded-template = lib.importJSON ./tree-sitter-embedded-template.json;
-  tree-sitter-erlang = lib.importJSON ./tree-sitter-erlang.json;
-  tree-sitter-factor = lib.importJSON ./tree-sitter-factor.json;
-  tree-sitter-fennel = lib.importJSON ./tree-sitter-fennel.json;
-  tree-sitter-fish = lib.importJSON ./tree-sitter-fish.json;
-  tree-sitter-fortran = lib.importJSON ./tree-sitter-fortran.json;
-  tree-sitter-gdscript = lib.importJSON ./tree-sitter-gdscript.json;
-  tree-sitter-gemini = lib.importJSON ./tree-sitter-gemini.json;
-  tree-sitter-gleam = lib.importJSON ./tree-sitter-gleam.json;
-  tree-sitter-glimmer = lib.importJSON ./tree-sitter-glimmer.json;
-  tree-sitter-glsl = lib.importJSON ./tree-sitter-glsl.json;
-  tree-sitter-go = lib.importJSON ./tree-sitter-go.json;
-  tree-sitter-go-template = lib.importJSON ./tree-sitter-go-template.json;
-  tree-sitter-godot-resource = lib.importJSON ./tree-sitter-godot-resource.json;
-  tree-sitter-gomod = lib.importJSON ./tree-sitter-gomod.json;
-  tree-sitter-gowork = lib.importJSON ./tree-sitter-gowork.json;
-  tree-sitter-graphql = lib.importJSON ./tree-sitter-graphql.json;
-  tree-sitter-haskell = lib.importJSON ./tree-sitter-haskell.json;
-  tree-sitter-hcl = lib.importJSON ./tree-sitter-hcl.json;
-  tree-sitter-heex = lib.importJSON ./tree-sitter-heex.json;
-  tree-sitter-hjson = lib.importJSON ./tree-sitter-hjson.json;
-  tree-sitter-html = lib.importJSON ./tree-sitter-html.json;
-  tree-sitter-http = lib.importJSON ./tree-sitter-http.json;
-  tree-sitter-hyprlang = lib.importJSON ./tree-sitter-hyprlang.json;
-  tree-sitter-janet-simple = lib.importJSON ./tree-sitter-janet-simple.json;
-  tree-sitter-java = lib.importJSON ./tree-sitter-java.json;
-  tree-sitter-javascript = lib.importJSON ./tree-sitter-javascript.json;
-  tree-sitter-jsdoc = lib.importJSON ./tree-sitter-jsdoc.json;
-  tree-sitter-json = lib.importJSON ./tree-sitter-json.json;
-  tree-sitter-json5 = lib.importJSON ./tree-sitter-json5.json;
-  tree-sitter-jsonnet = lib.importJSON ./tree-sitter-jsonnet.json;
-  tree-sitter-julia = lib.importJSON ./tree-sitter-julia.json;
-  tree-sitter-just = lib.importJSON ./tree-sitter-just.json;
-  tree-sitter-kdl = lib.importJSON ./tree-sitter-kdl.json;
-  tree-sitter-koka = lib.importJSON ./tree-sitter-koka.json;
-  tree-sitter-kotlin = lib.importJSON ./tree-sitter-kotlin.json;
-  tree-sitter-latex = lib.importJSON ./tree-sitter-latex.json;
-  tree-sitter-ledger = lib.importJSON ./tree-sitter-ledger.json;
-  tree-sitter-llvm = lib.importJSON ./tree-sitter-llvm.json;
-  tree-sitter-lua = lib.importJSON ./tree-sitter-lua.json;
-  tree-sitter-make = lib.importJSON ./tree-sitter-make.json;
-  tree-sitter-markdown = lib.importJSON ./tree-sitter-markdown.json;
-  tree-sitter-netlinx = lib.importJSON ./tree-sitter-netlinx.json;
-  tree-sitter-nickel = lib.importJSON ./tree-sitter-nickel.json;
-  tree-sitter-nix = lib.importJSON ./tree-sitter-nix.json;
-  tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json;
-  tree-sitter-norg-meta = lib.importJSON ./tree-sitter-norg-meta.json;
-  tree-sitter-nu = lib.importJSON ./tree-sitter-nu.json;
-  tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json;
-  tree-sitter-org-nvim = lib.importJSON ./tree-sitter-org-nvim.json;
-  tree-sitter-perl = lib.importJSON ./tree-sitter-perl.json;
-  tree-sitter-pgn = lib.importJSON ./tree-sitter-pgn.json;
-  tree-sitter-php = lib.importJSON ./tree-sitter-php.json;
-  tree-sitter-pioasm = lib.importJSON ./tree-sitter-pioasm.json;
-  tree-sitter-prisma = lib.importJSON ./tree-sitter-prisma.json;
-  tree-sitter-proto = lib.importJSON ./tree-sitter-proto.json;
-  tree-sitter-pug = lib.importJSON ./tree-sitter-pug.json;
-  tree-sitter-python = lib.importJSON ./tree-sitter-python.json;
-  tree-sitter-ql = lib.importJSON ./tree-sitter-ql.json;
-  tree-sitter-ql-dbscheme = lib.importJSON ./tree-sitter-ql-dbscheme.json;
-  tree-sitter-query = lib.importJSON ./tree-sitter-query.json;
-  tree-sitter-r = lib.importJSON ./tree-sitter-r.json;
-  tree-sitter-regex = lib.importJSON ./tree-sitter-regex.json;
-  tree-sitter-rego = lib.importJSON ./tree-sitter-rego.json;
-  tree-sitter-river = lib.importJSON ./tree-sitter-river.json;
-  tree-sitter-rst = lib.importJSON ./tree-sitter-rst.json;
-  tree-sitter-ruby = lib.importJSON ./tree-sitter-ruby.json;
-  tree-sitter-rust = lib.importJSON ./tree-sitter-rust.json;
-  tree-sitter-scala = lib.importJSON ./tree-sitter-scala.json;
-  tree-sitter-scheme = lib.importJSON ./tree-sitter-scheme.json;
-  tree-sitter-scss = lib.importJSON ./tree-sitter-scss.json;
-  tree-sitter-slint = lib.importJSON ./tree-sitter-slint.json;
-  tree-sitter-smithy = lib.importJSON ./tree-sitter-smithy.json;
-  tree-sitter-sml = lib.importJSON ./tree-sitter-sml.json;
-  tree-sitter-solidity = lib.importJSON ./tree-sitter-solidity.json;
-  tree-sitter-sparql = lib.importJSON ./tree-sitter-sparql.json;
-  tree-sitter-sql = lib.importJSON ./tree-sitter-sql.json;
-  tree-sitter-supercollider = lib.importJSON ./tree-sitter-supercollider.json;
-  tree-sitter-surface = lib.importJSON ./tree-sitter-surface.json;
-  tree-sitter-svelte = lib.importJSON ./tree-sitter-svelte.json;
-  tree-sitter-talon = lib.importJSON ./tree-sitter-talon.json;
-  tree-sitter-templ = lib.importJSON ./tree-sitter-templ.json;
-  tree-sitter-tera = lib.importJSON ./tree-sitter-tera.json;
-  tree-sitter-tiger = lib.importJSON ./tree-sitter-tiger.json;
-  tree-sitter-tlaplus = lib.importJSON ./tree-sitter-tlaplus.json;
-  tree-sitter-todotxt = lib.importJSON ./tree-sitter-todotxt.json;
-  tree-sitter-toml = lib.importJSON ./tree-sitter-toml.json;
-  tree-sitter-tsq = lib.importJSON ./tree-sitter-tsq.json;
-  tree-sitter-turtle = lib.importJSON ./tree-sitter-turtle.json;
-  tree-sitter-twig = lib.importJSON ./tree-sitter-twig.json;
-  tree-sitter-typescript = lib.importJSON ./tree-sitter-typescript.json;
-  tree-sitter-typst = lib.importJSON ./tree-sitter-typst.json;
-  tree-sitter-uiua = lib.importJSON ./tree-sitter-uiua.json;
-  tree-sitter-verilog = lib.importJSON ./tree-sitter-verilog.json;
-  tree-sitter-vim = lib.importJSON ./tree-sitter-vim.json;
-  tree-sitter-vue = lib.importJSON ./tree-sitter-vue.json;
-  tree-sitter-wgsl = lib.importJSON ./tree-sitter-wgsl.json;
-  tree-sitter-wing = lib.importJSON ./tree-sitter-wing.json;
-  tree-sitter-yaml = lib.importJSON ./tree-sitter-yaml.json;
-  tree-sitter-yang = lib.importJSON ./tree-sitter-yang.json;
-  tree-sitter-zig = lib.importJSON ./tree-sitter-zig.json;
-}
+  lib,
+  fetchFromGitHub,
+  fetchFromGitLab,
+  fetchFromSourcehut,
+  nix-update-script,
+}:
+
+let
+  /**
+    Set of grammar sources. See ./grammar-sources.nix to define a new grammar.
+  */
+  grammar-sources = import ./grammar-sources.nix;
+
+  /**
+    Parse a flakeref style string to { type, owner, repo, ref }
+
+    FIXME: switch to builtins.parseFlakeRef when stable
+  */
+  parseUrl =
+    url:
+    let
+      parts = lib.match "(.+):([^/]+)\/([^/?]+)((\/|.+ref=)([^&]+))?" url;
+      ref = lib.elemAt parts 5;
+    in
+    {
+      type = lib.elemAt parts 0;
+      owner = lib.elemAt parts 1;
+      repo = lib.elemAt parts 2;
+    }
+    // lib.optionalAttrs (ref != null) { inherit ref; };
+
+  /**
+    Check if a version attr represents an unstable release.
+  */
+  isUnstable = version: lib.isList (lib.match ".+-unstable-.+" version);
+
+in
+
+lib.mapAttrs' (
+  language: attrs:
+  lib.nameValuePair "tree-sitter-${language}" (
+    {
+      # Default to the source attr name as the language
+      inherit language;
+
+      # Insert auto-update support
+      passthru.updateScript = nix-update-script {
+        extraArgs = [
+          "--override-filename"
+          "pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix"
+        ]
+        ++ (
+          if (isUnstable attrs.version) then
+            [
+              "--version"
+              "branch"
+            ]
+          else
+            [
+              "--version-regex"
+              "^v?(\\d+\\.\\d+\\.\\d+)"
+            ]
+        );
+      };
+    }
+
+    # Expand flakeref style shorthand into a source expression
+    // lib.optionalAttrs (attrs ? url && attrs ? hash) {
+      src =
+        let
+          source = parseUrl attrs.url;
+          fetch = lib.getAttr source.type {
+            github = fetchFromGitHub;
+            gitlab = fetchFromGitLab;
+            sourcehut = fetchFromSourcehut;
+            # NOTE: include other types here as required
+          };
+        in
+        fetch {
+          inherit (source)
+            owner
+            repo
+            ;
+          rev = source.ref or "v${attrs.version}";
+          inherit (attrs) hash;
+        };
+    }
+    // removeAttrs attrs [
+      "url"
+      "hash"
+    ]
+  )
+) 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
new file mode 100644
index 000000000000..2fa19af65f72
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
@@ -0,0 +1,795 @@
+{
+  bash = {
+    version = "0.23.3";
+    url = "github:tree-sitter/tree-sitter-bash";
+    hash = "sha256-7N1PLVMJxwN5FzHW9NbXZTzGhvziwLCC8tDO3qdjtOo=";
+  };
+
+  beancount = {
+    version = "2.4.1";
+    url = "github:polarmutex/tree-sitter-beancount";
+    hash = "sha256-i/Dgen2qF1Qmpi0nm2hDGNUe0tSw03llY4tPTiygWGQ=";
+  };
+
+  bibtex = {
+    version = "0-unstable-2021-03-26";
+    url = "github:latex-lsp/tree-sitter-bibtex/ccfd77db0ed799b6c22c214fe9d2937f47bc8b34";
+    hash = "sha256-wgduSxlpbJy/ITenBLfj5lhziUM1BApX6MjXhWcb7lQ=";
+  };
+
+  bitbake = {
+    version = "1.1.0";
+    url = "github:amaanq/tree-sitter-bitbake";
+    hash = "sha256-PSI1XVDGwDk5GjHjvCJfmBDfYM2Gmm1KR4h5KxBR1d0=";
+  };
+
+  bqn = {
+    version = "0.3.2";
+    url = "github:shnarazk/tree-sitter-bqn";
+    hash = "sha256-/FsA5GeFhWYFl1L9pF+sQfDSyihTnweEdz2k8mtLqnY=";
+  };
+
+  c-sharp = {
+    version = "0.23.1";
+    url = "github:tree-sitter/tree-sitter-c-sharp";
+    hash = "sha256-weH0nyLpvVK/OpgvOjTuJdH2Hm4a1wVshHmhUdFq3XA=";
+  };
+
+  c = {
+    version = "0.23.5";
+    url = "github:tree-sitter/tree-sitter-c";
+    hash = "sha256-6sebiNg9P/B/5HrbGO7bl3GHVMfVUepetJuszEeTh+8=";
+  };
+
+  clojure = {
+    version = "0-unstable-2025-08-26";
+    url = "github:sogaiu/tree-sitter-clojure/e43eff80d17cf34852dcd92ca5e6986d23a7040f";
+    hash = "sha256-jokekIuuQLx5UtuPs4XAI+euispeFCwSQByVKVelrC4=";
+  };
+
+  cmake = {
+    version = "0.7.1";
+    url = "github:uyha/tree-sitter-cmake";
+    hash = "sha256-OxViW7H5fNc5BP072ob7GGgx1EYc6TiQEut0wHGrE1c=";
+  };
+
+  comment = {
+    version = "0.1.0";
+    url = "github:stsewd/tree-sitter-comment";
+    hash = "sha256-XfHUHWenRjjQer9N4jhkFjNDlvz8ZI8Qep5eiWIyr7Q=";
+  };
+
+  commonlisp = {
+    version = "0.4.1";
+    url = "github:thehamsta/tree-sitter-commonlisp";
+    hash = "sha256-wHVdRiorBgxQ+gG+m/duv9nt5COxz6XK0AcKQ5FX43U=";
+  };
+
+  cpp = {
+    version = "0.23.4";
+    url = "github:tree-sitter/tree-sitter-cpp";
+    hash = "sha256-tP5Tu747V8QMCEBYwOEmMQUm8OjojpJdlRmjcJTbe2k=";
+  };
+
+  crystal = {
+    version = "0-unstable-2025-09-09";
+    url = "github:crystal-lang-tools/tree-sitter-crystal/f0ada43161f77d5bad18c4ce0b21d1dc9310e408";
+    hash = "sha256-5NPRFMeMbAe/wwFkUMkOJxMABFPBk2AbJ5HsY6RZfUg=";
+  };
+
+  css = {
+    version = "0.23.2";
+    url = "github:tree-sitter/tree-sitter-css";
+    hash = "sha256-LP2UBU/RgZCnVwCnM7bQv6DZHmDrqdCjynV6Jv1PsjA=";
+  };
+
+  cuda = {
+    version = "0.21.1";
+    url = "github:thehamsta/tree-sitter-cuda";
+    hash = "sha256-sX9AOe8dJJsRbzGq20qakWBnLiwYQ90mQspAuYxQzoQ=";
+  };
+
+  cue = {
+    version = "0.1.0";
+    url = "github:eonpatapon/tree-sitter-cue";
+    hash = "sha256-ujSBOwOnjsKuFhHtt4zvj90VcQsak8mEcWYJ0e5/mKc=";
+  };
+
+  dart = {
+    version = "0-unstable-2025-02-28";
+    url = "github:usernobody14/tree-sitter-dart/80e23c07b64494f7e21090bb3450223ef0b192f4";
+    hash = "sha256-bMFBSVAHTGstvalL5vZGahA5gL95IZQmJfBOE+trnwM=";
+  };
+
+  devicetree = {
+    version = "0.11.1";
+    url = "github:joelspadin/tree-sitter-devicetree";
+    hash = "sha256-2uJEItLwoBoiB49r2XuO216Dhu9AnAa0p7Plmm4JNY8=";
+  };
+
+  dockerfile = {
+    version = "0.2.0";
+    url = "github:camdencheek/tree-sitter-dockerfile";
+    hash = "sha256-4J1bA0y3YSriFTkYt81VftVtlQk790qmMlG/S3FNPCY=";
+  };
+
+  dot = {
+    version = "0-unstable-2022-08-25";
+    url = "github:rydesun/tree-sitter-dot/9ab85550c896d8b294d9b9ca1e30698736f08cea";
+    hash = "sha256-w4DInIT7mkTvQ6Hmi8yaAww6ktyNgRz0tPfBLGnOawQ=";
+  };
+
+  earthfile = {
+    version = "0-unstable-2025-05-13";
+    url = "github:glehmann/tree-sitter-earthfile/a37c5ee95ce401ca311c0ae1369d9cfb953e151d";
+    hash = "sha256-lYoS3RtHPYRrkfgo/qqAnT918FXeXnDUhG4l1TMXjb4=";
+  };
+
+  eex = {
+    version = "0.1.0";
+    url = "github:connorlay/tree-sitter-eex";
+    hash = "sha256-UPq62MkfGFh9m/UskoB9uBDIYOcotITCJXDyrbg/wKY=";
+  };
+
+  elisp = rec {
+    version = "1.3.0";
+    url = "github:wilfred/tree-sitter-elisp?ref=${version}";
+    hash = "sha256-hmPJtB0pEBqc9rbnQ5YZzs9kHCqXWfbjRWN6WoFZ1NQ=";
+  };
+
+  elixir = {
+    version = "0.3.4";
+    url = "github:elixir-lang/tree-sitter-elixir";
+    hash = "sha256-9M/DpqpGivDtgGt3ojU/kHR51sla59+KtZ/95hT6IIo=";
+  };
+
+  elm = {
+    version = "5.7.0";
+    url = "github:elm-tooling/tree-sitter-elm";
+    hash = "sha256-vYN1E49IpsvTUmxuzRyydCmhYZYGndcZPMBYgSMudrE=";
+  };
+
+  embedded-template = {
+    version = "0.25.0";
+    url = "github:tree-sitter/tree-sitter-embedded-template";
+    hash = "sha256-nBQain0Lc21jOgQFfvkyq615ZmT8qdMxtqIoUcOcO3A=";
+  };
+
+  erlang = rec {
+    version = "0.1.0";
+    url = "github:WhatsApp/tree-sitter-erlang?ref=${version}";
+    hash = "sha256-FH8DNE03k95ZsRwaiXHkaU9/cdWrWALCEdChN5ZPdog=";
+  };
+
+  factor = {
+    version = "0-unstable-2025-01-12";
+    url = "github:erochest/tree-sitter-factor/554d8b705df61864eb41a0ecf3741e94eb9f0c54";
+    hash = "sha256-Z60ySUrBAiNm5s3iH/6jkjsKX5mPAW8bgid+5m2MzJM=";
+  };
+
+  fennel = {
+    version = "0-unstable-2025-09-07";
+    url = "github:travonted/tree-sitter-fennel/36eb796a84b4f57bdf159d0a99267260d4960c89";
+    hash = "sha256-aFcTPgWkd/o1qu8d/hulmVDyFlTHJgb35iea4Jc1510=";
+  };
+
+  fish = rec {
+    version = "3.6.0";
+    url = "github:ram02z/tree-sitter-fish?ref=${version}";
+    hash = "sha256-ZQj6XR7pHGoCOBS6GOHiRW9LWNoNPlwVcZe5F2mtGNE=";
+  };
+
+  fortran = {
+    version = "0.4.0";
+    url = "github:stadelmanma/tree-sitter-fortran";
+    hash = "sha256-STRbEv7kBtkrokXgaN9g1JNwWmSV+7gkyklhYKJszNY=";
+  };
+
+  gdscript = {
+    version = "6.0.0";
+    url = "github:prestonknopp/tree-sitter-gdscript";
+    hash = "sha256-S+AF6slDnw3O00C8hcL013A8MU7fKU5mCwhyV50rqmI=";
+  };
+
+  gemini = rec {
+    version = "0.1.0";
+    url = "github:blessanabraham/tree-sitter-gemini?ref=${version}";
+    hash = "sha256-grWpLh5ozSUct5sSI8M8qnWy72b7ruRuhOpoyswvJuU=";
+  };
+
+  gleam = {
+    version = "1.1.0";
+    url = "github:gleam-lang/tree-sitter-gleam";
+    hash = "sha256-GIikbo8N2bmUa8wddpAgTHeejCInoEY8HxGDbuYq/zQ=";
+  };
+
+  glimmer = {
+    version = "1.4.0";
+    url = "github:alexlafroscia/tree-sitter-glimmer?ref=v1.4.0-tree-sitter-glimmer";
+    hash = "sha256-4kEOvObNnZtt2aaf0Df+R/Wvyk/JlFnsvbasDIJxt4w=";
+  };
+
+  glsl = {
+    version = "0.2.0";
+    url = "github:thehamsta/tree-sitter-glsl";
+    hash = "sha256-S0Yr/RQE4uLpazphTKLUoHgPEOUbOBDGCkkRXemsHjQ=";
+  };
+
+  go-template = {
+    version = "0-unstable-2025-08-23";
+    url = "github:ngalaiko/tree-sitter-go-template/65f4f86c3aaa9dabab36e3482584e8a111cf7db1";
+    hash = "sha256-rSZOOtaBNCXNT0ztkeD4vumTN8bid9OBE82FNrl2wPE=";
+  };
+
+  go = {
+    version = "0.25.0";
+    url = "github:tree-sitter/tree-sitter-go";
+    hash = "sha256-y7bTET8ypPczPnMVlCaiZuswcA7vFrDOc2jlbfVk5Sk=";
+  };
+
+  godot-resource = {
+    language = "godot_resource";
+    version = "0.7.0";
+    url = "github:prestonknopp/tree-sitter-godot-resource";
+    hash = "sha256-+tUMLqtak9ToY+UUnIiqngDs6diG8crW8Ac0mbk7FMo=";
+  };
+
+  gomod = {
+    version = "1.1.0";
+    url = "github:camdencheek/tree-sitter-go-mod";
+    hash = "sha256-C3pPBgm68mmaPmstyIpIvvDHsx29yZ0ZX/QoUqwjb+0=";
+  };
+
+  gowork = {
+    version = "0-unstable-2022-10-04";
+    url = "github:omertuc/tree-sitter-go-work/949a8a470559543857a62102c84700d291fc984c";
+    hash = "sha256-Tode7W05xaOKKD5QOp3rayFgLEOiMJUeGpVsIrizxto=";
+  };
+
+  graphql = {
+    version = "0-unstable-2021-05-10";
+    url = "github:bkegley/tree-sitter-graphql/5e66e961eee421786bdda8495ed1db045e06b5fe";
+    hash = "sha256-NvE9Rpdp4sALqKSRWJpqxwl6obmqnIIdvrL1nK5peXc=";
+  };
+
+  haskell = {
+    version = "0.23.1";
+    url = "github:tree-sitter/tree-sitter-haskell";
+    hash = "sha256-bggXKbV4vTWapQAbERPUszxpQtpC1RTujNhwgbjY7T4=";
+  };
+
+  hcl = {
+    version = "1.1.0";
+    url = "github:MichaHoffmann/tree-sitter-hcl";
+    hash = "sha256-saVKSYUJY7OuIuNm9EpQnhFO/vQGKxCXuv3EKYOJzfs=";
+  };
+
+  heex = {
+    version = "0.8.0";
+    url = "github:connorlay/tree-sitter-heex";
+    hash = "sha256-rifYGyIpB14VfcEZrmRwYSz+ZcajQcB4mCjXnXuVFDQ=";
+  };
+
+  hjson = {
+    version = "0-unstable-2021-08-02";
+    url = "github:winston0410/tree-sitter-hjson/02fa3b79b3ff9a296066da6277adfc3f26cbc9e0";
+    hash = "sha256-NsTf3DR3gHVMYZDmTNvThB5bJcDwTcJ1+3eJhvsiDn8=";
+  };
+
+  html = {
+    version = "0.23.2";
+    url = "github:tree-sitter/tree-sitter-html";
+    hash = "sha256-Pd5Me1twLGOrRB3pSMVX9M8VKenTK0896aoLznjNkGo=";
+  };
+
+  http = {
+    version = "3.0.0";
+    url = "github:ntbbloodbath/tree-sitter-http?ref=v3.0";
+    hash = "sha256-pg7QmnfhuCmyuq6HupCJl4H/rcxDeUn563LoL+Wd2Uw=";
+  };
+
+  hyprlang = {
+    version = "3.0.0";
+    url = "github:tree-sitter-grammars/tree-sitter-hyprlang";
+    hash = "sha256-1HGA4VUWM/iR1XBNmrsdj1PRGo7qPYMw5vmcVQO1BH0=";
+  };
+
+  janet-simple = {
+    version = "0-unstable-2025-05-19";
+    url = "github:sogaiu/tree-sitter-janet-simple/7e28cbf1ca061887ea43591a2898001f4245fddf";
+    hash = "sha256-qWsUPZfQkuEUiuCSsqs92MIMEvdD+q2bwKir3oE5thc=";
+  };
+
+  java = {
+    version = "0.23.5";
+    url = "github:tree-sitter/tree-sitter-java";
+    hash = "sha256-OvEO1BLZLjP3jt4gar18kiXderksFKO0WFXDQqGLRIY=";
+  };
+
+  javascript = {
+    version = "0.25.0";
+    url = "github:tree-sitter/tree-sitter-javascript";
+    hash = "sha256-2Jj/SUG+k8lHlGSuPZvHjJojvQFgDiZHZzH8xLu7suE=";
+  };
+
+  jsdoc = {
+    version = "0.25.0";
+    url = "github:tree-sitter/tree-sitter-jsdoc";
+    hash = "sha256-xjLC56NiOwwb5BJ2DLiG3rknMR3rrcYrPuHI24NVL+M=";
+  };
+
+  json = {
+    version = "0.24.8";
+    url = "github:tree-sitter/tree-sitter-json";
+    hash = "sha256-DNZC2cTy1C8OaMOpEHM6NoRtOIbLaBf0CLXXWCKODlw=";
+  };
+
+  json5 = {
+    version = "0.1.0";
+    url = "github:joakker/tree-sitter-json5";
+    hash = "sha256-QfzqRUe9Ji/QXBHHOJHuftIJKOONtmS1ml391QDKfTI=";
+  };
+
+  jsonnet = {
+    version = "0-unstable-2024-08-15";
+    url = "github:sourcegraph/tree-sitter-jsonnet/ddd075f1939aed8147b7aa67f042eda3fce22790";
+    hash = "sha256-ODGRkirfUG8DqV6ZcGRjKeCyEtsU0r+ICK0kCG6Xza0=";
+  };
+
+  julia = {
+    version = "0.23.1";
+    url = "github:tree-sitter/tree-sitter-julia";
+    hash = "sha256-jwtMgHYSa9/kcsqyEUBrxC+U955zFZHVQ4N4iogiIHY=";
+  };
+
+  just = {
+    version = "0-unstable-2025-01-05";
+    url = "github:IndianBoy42/tree-sitter-just/bb0c898a80644de438e6efe5d88d30bf092935cd";
+    hash = "sha256-FwEuH/2R745jsuFaVGNeUTv65xW+MPjbcakRNcAWfZU=";
+  };
+
+  kdl = {
+    version = "1.1.0";
+    url = "github:tree-sitter-grammars/tree-sitter-kdl";
+    hash = "sha256-+oJqfbBDbrNS7E+x/QCX9m6FVf0NLw4qWH9n54joJYA=";
+  };
+
+  koka = {
+    version = "0-unstable-2025-07-26";
+    url = "github:mtoohey31/tree-sitter-koka/6dce132911ac375ac1a3591c868c47a2a84b30aa";
+    hash = "sha256-QXKfXg1qs3HNvjk1J8Kzm6uwR0frXXEONlJQPCqioNA=";
+  };
+
+  kotlin = rec {
+    version = "0.3.8";
+    url = "github:fwcd/tree-sitter-kotlin?ref=${version}";
+    hash = "sha256-kze1kF8naH2qQou58MKMhzmMXk0ouzcP6i3F61kOYi8=";
+  };
+
+  latex = {
+    version = "0.6.0";
+    url = "github:latex-lsp/tree-sitter-latex";
+    hash = "sha256-nb1pOSHawLIw7/gaepuq2EN0a/F7/un4Xt5VCnDzvWs=";
+    generate = true;
+  };
+
+  ledger = {
+    version = "0-unstable-2025-05-04";
+    url = "github:cbarrete/tree-sitter-ledger/96c92d4908a836bf8f661166721c98439f8afb80";
+    hash = "sha256-L2xUTItnQ/bcieasItrozjAEJLm/fsUUyMex2juCnjw=";
+  };
+
+  llvm = {
+    version = "0-unstable-2024-10-07";
+    url = "github:benwilliamgraham/tree-sitter-llvm/c14cb839003348692158b845db9edda201374548";
+    hash = "sha256-L3XwPhvwIR/mUbugMbaHS9dXyhO7bApv/gdlxQ+2Bbo=";
+  };
+
+  lua = {
+    version = "0-unstable-2025-05-16";
+    url = "github:MunifTanjim/tree-sitter-lua/4fbec840c34149b7d5fe10097c93a320ee4af053";
+    hash = "sha256-fO8XqlauYiPR0KaFzlAzvkrYXgEsiSzlB3xYzUpcbrs=";
+  };
+
+  make = {
+    version = "0-unstable-2021-12-16";
+    url = "github:alemuller/tree-sitter-make/a4b9187417d6be349ee5fd4b6e77b4172c6827dd";
+    hash = "sha256-qQqapnKKH5X8rkxbZG5PjnyxvnpyZHpFVi/CLkIn/x0=";
+  };
+
+  markdown = {
+    version = "0.3.2";
+    url = "github:MDeiml/tree-sitter-markdown";
+    hash = "sha256-OlVuHz9/5lxsGVT+1WhKx+7XtQiezMW1odiHGinzro8=";
+    location = "tree-sitter-markdown";
+  };
+
+  markdown-inline = {
+    language = "markdown_inline";
+    version = "0.3.2";
+    url = "github:MDeiml/tree-sitter-markdown";
+    hash = "sha256-OlVuHz9/5lxsGVT+1WhKx+7XtQiezMW1odiHGinzro8=";
+    location = "tree-sitter-markdown-inline";
+  };
+
+  netlinx = {
+    version = "1.0.4";
+    url = "github:norgate-av/tree-sitter-netlinx";
+    hash = "sha256-WCzt5cglAQ9/1VRP/TJ0EjeLXrF9erIGMButRV7iAic=";
+  };
+
+  nickel = {
+    version = "0.3.0";
+    url = "github:nickel-lang/tree-sitter-nickel?ref=0.3";
+    hash = "sha256-jL054OJj+1eXksNYOTTTFzZjwPqTFp06syC3TInN8rc=";
+  };
+
+  nix = {
+    version = "0-unstable-2025-08-11";
+    url = "github:nix-community/tree-sitter-nix/ff4e2b4c5a3598e8be3edf16bc69f6677af32145";
+    hash = "sha256-VPkXKsoKs5ywVIGz+xqvD73nINur2flpEmKUKJRFYy8=";
+  };
+
+  norg-meta = {
+    version = "0.1.0";
+    url = "github:nvim-neorg/tree-sitter-norg-meta";
+    hash = "sha256-8qSdwHlfnjFuQF4zNdLtU2/tzDRhDZbo9K54Xxgn5+8=";
+  };
+
+  norg = {
+    version = "0.2.6";
+    url = "github:nvim-neorg/tree-sitter-norg";
+    hash = "sha256-z3h5qMuNKnpQgV62xZ02F5vWEq4VEnm5lxwEnIFu+Rw=";
+  };
+
+  nu = {
+    version = "0-unstable-2025-09-19";
+    url = "github:nushell/tree-sitter-nu/0e6c59c46db3c246eaf86ce5b325da1247e971a5";
+    hash = "sha256-qGKQTdMrxhsMSSY7ghFkc/32O6Fhps9b9oG1wo0m1NA=";
+  };
+
+  ocaml = {
+    version = "0.24.2";
+    url = "github:tree-sitter/tree-sitter-ocaml";
+    hash = "sha256-e08lrKCyQRpb8pnLV6KK4ye53YBjxQ52nnDIzH+7ONc=";
+  };
+
+  ocaml-interface = {
+    language = "ocaml_interface";
+    version = "0.24.2";
+    url = "github:tree-sitter/tree-sitter-ocaml";
+    hash = "sha256-e08lrKCyQRpb8pnLV6KK4ye53YBjxQ52nnDIzH+7ONc=";
+  };
+
+  org-nvim = {
+    version = "0-unstable-2023-06-19";
+    url = "github:milisims/tree-sitter-org/64cfbc213f5a83da17632c95382a5a0a2f3357c1";
+    hash = "sha256-/03eZBbv23W5s/GbDgPgaJV5TyK+/lrWUVeINRS5wtA=";
+  };
+
+  perl = {
+    version = "1.1.1";
+    url = "github:ganezdragon/tree-sitter-perl";
+    hash = "sha256-1RnL1dFbTWalqIYg8oGNzwvZxOFPPKwj86Rc3ErfYMU=";
+  };
+
+  pgn = {
+    version = "1.2.12";
+    url = "github:rolandwalker/tree-sitter-pgn";
+    hash = "sha256-VxRXEidQG0Q/BR4ob3Xr/UCuu7NgmaOGAqJdgHzyX1U=";
+  };
+
+  php = {
+    version = "0.24.2";
+    url = "github:tree-sitter/tree-sitter-php";
+    hash = "sha256-jI7yzcoHS/tNxUqJI4aD1rdEZV3jMn1GZD0J+81Dyf0=";
+  };
+
+  pioasm = {
+    version = "0-unstable-2024-10-12";
+    url = "github:leo60228/tree-sitter-pioasm/afece58efdb30440bddd151ef1347fa8d6f744a9";
+    hash = "sha256-rUuolF/jPJGiqunD6SLUJ0x/MTIJ+mJ1QSBCasUw5T8=";
+  };
+
+  prisma = {
+    version = "1.5.1";
+    url = "github:victorhqc/tree-sitter-prisma";
+    hash = "sha256-WxR3URFjljD9IEoKRvo0eBbv16PGhrv9aTUWPw8XlJA=";
+  };
+
+  proto = {
+    version = "0-unstable-2021-06-12";
+    url = "github:mitchellh/tree-sitter-proto/42d82fa18f8afe59b5fc0b16c207ee4f84cb185f";
+    hash = "sha256-cX+0YARIa9i8UymPPviyoj+Wh37AFYl9fsoNZMQXPgA=";
+  };
+
+  pug = {
+    version = "0-unstable-2024-11-17";
+    url = "github:zealot128/tree-sitter-pug/13e9195370172c86a8b88184cc358b23b677cc46";
+    hash = "sha256-Yk1oBv9Flz+QX5tyFZwx0y67I5qgbnLhwYuAvLi9eV8=";
+  };
+
+  python = {
+    version = "0.25.0";
+    url = "github:tree-sitter/tree-sitter-python";
+    hash = "sha256-F5XH21PjPpbwYylgKdwD3MZ5o0amDt4xf/e5UikPcxY=";
+  };
+
+  ql-dbscheme = {
+    version = "0.23.1";
+    url = "github:tree-sitter/tree-sitter-ql-dbscheme";
+    hash = "sha256-lXHm+I3zzCUOR/HjnhQM3Ga+yZr2F2WN28SmpT9Q6nE=";
+  };
+
+  ql = {
+    version = "0.23.1";
+    url = "github:tree-sitter/tree-sitter-ql";
+    hash = "sha256-mJ/bj09mT1WTaiKoXiRXDM7dkenf5hv2ArXieeTVe6I=";
+  };
+
+  query = {
+    version = "0.5.0";
+    url = "github:nvim-treesitter/tree-sitter-query";
+    hash = "sha256-2JxX4KntUP/DvoCik0NYzfrU/qzs43uDwy21JkU8Hjc=";
+  };
+
+  r = {
+    version = "1.2.0";
+    url = "github:r-lib/tree-sitter-r";
+    hash = "sha256-SkCLFIUvJWTtg4m5NMfHbBKald470Kni2mhj2Oxc5ZU=";
+  };
+
+  razor = {
+    version = "0-unstable-2016-07-08";
+    url = "github:tree-sitter/tree-sitter-razor/60edbd8e798e416f5226a746396efa6a8614fa9b";
+    hash = "sha256-UVzs4z1Aa/Wvpwck4wrApijTEOrc53h867M32m2yutE=";
+    # Source repo is marked as archived (no update for 9 hears) and does not
+    # compile with current tree-sitter toolchain.
+    meta.broken = true;
+  };
+
+  regex = {
+    version = "0.25.0";
+    url = "github:tree-sitter/tree-sitter-regex";
+    hash = "sha256-bR0K6SR19QuQwDUic+CJ69VQTSGqry5a5IOpPTVJFlo=";
+  };
+
+  rego = {
+    version = "0-unstable-2024-06-12";
+    url = "github:FallenAngel97/tree-sitter-rego/20b5a5958c837bc9f74b231022a68a594a313f6d";
+    hash = "sha256-XwlVsOlxYzB0x+T05iuIp7nFAoQkMByKiHXZ0t5QsjI=";
+  };
+
+  river = {
+    version = "0-unstable-2023-11-22";
+    url = "github:grafana/tree-sitter-river/eafcdc5147f985fea120feb670f1df7babb2f79e";
+    hash = "sha256-fhuIO++hLr5DqqwgFXgg8QGmcheTpYaYLMo7117rjyk=";
+  };
+
+  rst = {
+    version = "0.1.0";
+    url = "github:stsewd/tree-sitter-rst";
+    hash = "sha256-g3CovnXY15SkxAdVk15M4hAxizqLc551omwKKG+Vozg=";
+  };
+
+  ruby = {
+    version = "0.23.1";
+    url = "github:tree-sitter/tree-sitter-ruby";
+    hash = "sha256-iu3MVJl0Qr/Ba+aOttmEzMiVY6EouGi5wGOx5ofROzA=";
+  };
+
+  rust = {
+    version = "0.23.2";
+    url = "github:tree-sitter/tree-sitter-rust";
+    hash = "sha256-aT+tlrEKMgWqTEq/NHh8Vj92h6i1aU6uPikDyaP2vfc=";
+  };
+
+  scala = {
+    version = "0.24.0";
+    url = "github:tree-sitter/tree-sitter-scala";
+    hash = "sha256-ZE+zjpb52hvehJjNchJYK81XZbGAudeTRxlczuoix5g=";
+  };
+
+  scheme = {
+    version = "0-unstable-2025-09-17";
+    url = "github:6cdh/tree-sitter-scheme/67b5c8d6ce19fd5265f13204fec0a3efa9e095d9";
+    hash = "sha256-njPs+AAQYIGzztARtlpl2pmTrA0ozcXmbpuJxFp+44s=";
+  };
+
+  scss = {
+    version = "1.0.0";
+    url = "github:serenadeai/tree-sitter-scss";
+    hash = "sha256-BFtMT6eccBWUyq6b8UXRAbB1R1XD3CrrFf1DM3aUI5c=";
+  };
+
+  slint = {
+    version = "0-unstable-2025-07-13";
+    url = "github:slint-ui/tree-sitter-slint/96bc969d20ff347030519184ea2467f4046a524d";
+    hash = "sha256-yTZxuA3Bco0Cv+kZ1VbfQZbIu12Y5N4b3HIUJ/PBpWA=";
+  };
+
+  smithy = {
+    version = "0.2.0";
+    url = "github:indoorvivants/tree-sitter-smithy";
+    hash = "sha256-3cqT6+e0uqAtd92M55qSbza1eph8gklGlEGyO9R170w=";
+  };
+
+  sml = {
+    version = "0.23.0";
+    url = "github:MatthewFluet/tree-sitter-sml";
+    hash = "sha256-hqsyHFcSmvyR50TKtOcidwABW+P31qisgSOtWTWM0tE=";
+  };
+
+  solidity = {
+    version = "1.2.3";
+    url = "github:JoranHonig/tree-sitter-solidity";
+    hash = "sha256-BN3a/gEZxOgRWm/H3CEFk4eTKhoZrBAFlUnZiLs9RUE=";
+  };
+
+  sparql = {
+    version = "0-unstable-2024-06-26";
+    url = "github:bonabeavis/tree-sitter-sparql/d853661ca680d8ff7f8d800182d5782b61d0dd58";
+    hash = "sha256-0BV0y8IyeIPpuxTixlJL1PsDCuhXbGaImu8JU8WFoPU=";
+  };
+
+  sql = {
+    version = "0.3.9";
+    url = "github:derekstride/tree-sitter-sql";
+    hash = "sha256-DC7cZs8ePQmj5t/6GgnmgT5ubuOBaaS3Xch/f76/ZWM=";
+    generate = true;
+  };
+
+  supercollider = {
+    version = "0.3.2";
+    url = "github:madskjeldgaard/tree-sitter-supercollider";
+    hash = "sha256-drn1S4gNm6fOSUTCa/CrAqCWoUn16y1hpaZBCPpyaNE=";
+  };
+
+  surface = {
+    version = "0.2.0";
+    url = "github:connorlay/tree-sitter-surface";
+    hash = "sha256-Hur6lae+9nk8pWL531K52fEsCAv14X5gmYKD9UULW4g=";
+  };
+
+  svelte = {
+    version = "0.11.0";
+    url = "github:Himujjal/tree-sitter-svelte";
+    hash = "sha256-novNVlLVHYIfjmC7W+F/1F0RxW6dd27/DwQ3n5UO6c4=";
+  };
+
+  talon = rec {
+    version = "5.0.0";
+    url = "github:wenkokke/tree-sitter-talon?ref=${version}";
+    hash = "sha256-NfPwnySeztMx3qzDbA4HE5WNVd6aImioZkvWi1lXh88=";
+  };
+
+  templ = {
+    version = "0-unstable-2025-09-14";
+    url = "github:vrischmann/tree-sitter-templ/27a1fc62c8dd4c49669e03629491f66449c6c435";
+    hash = "sha256-2h1NPQtutTmdVKjydq/ZRvBCJ3YEiT+ZVcL72fb2m9M=";
+  };
+
+  tera = {
+    version = "0-unstable-2025-07-22";
+    url = "github:uncenter/tree-sitter-tera/692937d52c8dfd91ce0dde722b9b4febbc9bc712";
+    hash = "sha256-3ZUark8lSH8mJwuLcvJPiQnE7+rlXstKkTPjvHzsE38=";
+  };
+
+  tiger = {
+    version = "0-unstable-2025-03-13";
+    url = "github:ambroisie/tree-sitter-tiger/4a77b2d7a004587646bddc4e854779044b6db459";
+    hash = "sha256-jLdJ3nLShoBxVCcUbnaswYG5d4UU8aaE1xexb2LnmTQ=";
+  };
+
+  tlaplus = rec {
+    # FIXME: remove language override after release is available that includes
+    # https://github.com/tlaplus-community/tree-sitter-tlaplus/pull/138
+    language = "@tlaplus/tlaplus";
+    version = "1.5.0";
+    url = "github:tlaplus-community/tree-sitter-tlaplus?ref=${version}";
+    hash = "sha256-k34gkAd0ueXEAww/Hc1mtBfn0Kp1pIBQtjDZ9GQeB4Q=";
+  };
+
+  todotxt = {
+    version = "0-unstable-2024-01-15";
+    url = "github:arnarg/tree-sitter-todotxt/3937c5cd105ec4127448651a21aef45f52d19609";
+    hash = "sha256-OeAh51rcFTiexAraRzIZUR/A8h9RPwKY7rmtc3ZzoRQ=";
+  };
+
+  toml = {
+    version = "0-unstable-2022-04-21";
+    url = "github:tree-sitter/tree-sitter-toml/342d9be207c2dba869b9967124c679b5e6fd0ebe";
+    hash = "sha256-V2c7K16g8PikE9eNgrM6iUDiu4kzBvHMFQwfkph+8QI=";
+  };
+
+  tsq = {
+    version = "0-unstable-2024-02-24";
+    url = "github:tree-sitter/tree-sitter-tsq/49da6de661be6a07cb51018880ebe680324e7b82";
+    hash = "sha256-md4xynJx9F/l6N+JZYU8CLXmz50fV13L8xGJVUqk6do=";
+  };
+
+  tsx = {
+    version = "0.23.2";
+    url = "github:tree-sitter/tree-sitter-typescript";
+    hash = "sha256-CU55+YoFJb6zWbJnbd38B7iEGkhukSVpBN7sli6GkGY=";
+  };
+
+  turtle = {
+    version = "0-unstable-2024-07-02";
+    url = "github:bonabeavis/tree-sitter-turtle/7f789ea7ef765080f71a298fc96b7c957fa24422";
+    hash = "sha256-z6f73euFAG9du5owz7V9WLbWK81Jg0DwxN1metKPbTA=";
+  };
+
+  twig = {
+    version = "0.7.0";
+    url = "github:kaermorchen/tree-sitter-twig";
+    hash = "sha256-JvJeSwdqyGNjWwJpcRiJ1hHVlUge3XX0xr/WBJ/LRhk=";
+  };
+
+  typescript = {
+    version = "0.23.2";
+    url = "github:tree-sitter/tree-sitter-typescript";
+    hash = "sha256-CU55+YoFJb6zWbJnbd38B7iEGkhukSVpBN7sli6GkGY=";
+  };
+
+  typst = {
+    version = "0.11.0";
+    url = "github:uben0/tree-sitter-typst";
+    hash = "sha256-n6RTRMJS3h+g+Wawjb7I9NJbz+w/SGi+DQVj1jiyGaU=";
+  };
+
+  uiua = {
+    version = "0.13.0";
+    url = "github:shnarazk/tree-sitter-uiua";
+    hash = "sha256-b/uR04wTiLVTgrLr2OuBzZ0LJd35BozFAe2MdBVW0Qk=";
+  };
+
+  verilog = {
+    version = "1.0.3";
+    url = "github:tree-sitter/tree-sitter-verilog";
+    hash = "sha256-SlK33WQhutIeCXAEFpvWbQAwOwMab68WD3LRIqPiaNY=";
+  };
+
+  vim = {
+    version = "0-unstable-2023-05-05";
+    url = "github:vigoux/tree-sitter-viml/7c317fbade4b40baa7babcd6c9097c157d148e60";
+    hash = "sha256-/TyPUBsKRcF9Ig8psqd4so2IMbHtTu4weJXgfd96Vrs=";
+  };
+
+  vue = {
+    version = "0-unstable-2021-04-04";
+    url = "github:ikatyang/tree-sitter-vue/91fe2754796cd8fba5f229505a23fa08f3546c06";
+    hash = "sha256-NeuNpMsKZUP5mrLCjJEOSLD6tlJpNO4Z/rFUqZLHE1A=";
+  };
+
+  wgsl = {
+    version = "0-unstable-2023-01-09";
+    url = "github:szebniok/tree-sitter-wgsl/40259f3c77ea856841a4e0c4c807705f3e4a2b65";
+    hash = "sha256-voLkcJ/062hzipb3Ak/mgQvFbrLUJdnXq1IupzjMJXA=";
+  };
+
+  wing = {
+    version = "0.83.11";
+    url = "github:winglang/tree-sitter-wing";
+    hash = "sha256-sL1ZoNuNUvTcOUf2I/6cQkeOPj4Jwqmv5zGXETdMByY=";
+  };
+
+  yaml = {
+    version = "0.7.1";
+    url = "github:tree-sitter-grammars/tree-sitter-yaml";
+    hash = "sha256-Z2L/aQWIyZ8cSqbfjm/i10fJP++yZ2tZgho0U3asA0g=";
+  };
+
+  yang = {
+    version = "0-unstable-2022-11-21";
+    url = "github:hubro/tree-sitter-yang/2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502";
+    hash = "sha256-6EIK1EStHrUHBLZBsZqd1LL05ZAJ6PKUyIzBBsTVjO8=";
+  };
+
+  zig = {
+    version = "0-unstable-2024-10-13";
+    url = "github:maxxnino/tree-sitter-zig/a80a6e9be81b33b182ce6305ae4ea28e29211bd5";
+    hash = "sha256-o3RAbW8kLSfKxuQ/z7WDb5BaDVxZUG5oFutovRkErjk=";
+  };
+
+}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json
deleted file mode 100644
index c412e01f1735..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-bash",
-  "rev": "487734f87fd87118028a65a4599352fa99c9cde8",
-  "date": "2024-11-11T01:52:16-05:00",
-  "path": "/nix/store/llqfabr73wh33skh2qzhwjh93zc5cy09-tree-sitter-bash",
-  "sha256": "1smlcfkxxknhya1b1h72zj3ccg35szbg9mii2xwh7iq9acnlzpgc",
-  "hash": "sha256-7N1PLVMJxwN5FzHW9NbXZTzGhvziwLCC8tDO3qdjtOo=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json
deleted file mode 100644
index 2e65733a096f..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/polarmutex/tree-sitter-beancount",
-  "rev": "07bfb0ec6d9e255d776cdd3362128364d2b0bb2f",
-  "date": "2025-07-20T21:33:46-04:00",
-  "path": "/nix/store/7q88wczdhi0ralm2fzdz7y42mxnsc34c-tree-sitter-beancount",
-  "sha256": "0r2ql0n4wkwbcdjpklxhsk91xm8q8dl9n9rdlqk585xagmxf1w4b",
-  "hash": "sha256-i/Dgen2qF1Qmpi0nm2hDGNUe0tSw03llY4tPTiygWGQ=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bibtex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bibtex.json
deleted file mode 100644
index 3b1ebf2fe4d4..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bibtex.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "url": "https://github.com/latex-lsp/tree-sitter-bibtex",
-  "rev": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34",
-  "date": "2021-03-26T15:53:50+01:00",
-  "path": "/nix/store/pg00zy53rni7znda2vbyyhkkclgja3kq-tree-sitter-bibtex",
-  "sha256": "0m7f3dkqbmy8x1bhl11m8f4p6n76wfvh99rp46zrqv39355nw1y2",
-  "hash": "sha256-wgduSxlpbJy/ITenBLfj5lhziUM1BApX6MjXhWcb7lQ=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json
deleted file mode 100644
index cb8c9dbc93db..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/amaanq/tree-sitter-bitbake",
-  "rev": "10bacac929ff36a1e8f4056503fe4f8717b21b94",
-  "date": "2023-11-10T20:00:03-05:00",
-  "path": "/nix/store/f2y79f98mwn86i12ggrydbhz1568ah78-tree-sitter-bitbake",
-  "sha256": "1pfma482nyc88x56v6l6rmhdy44qbwibrqri38wkkh66a1fka8ix",
-  "hash": "sha256-PSI1XVDGwDk5GjHjvCJfmBDfYM2Gmm1KR4h5KxBR1d0=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json
deleted file mode 100644
index 13bb6ec8a2e4..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/shnarazk/tree-sitter-bqn",
-  "rev": "a90b371503f158699042423918e4c5e9285f5519",
-  "date": "2023-10-12T14:03:08+09:00",
-  "path": "/nix/store/l8jagwjzgm9kwgda2rqgkzxpszlmf6br-tree-sitter-bqn",
-  "sha256": "0xma9dmz591xfy20g7sk535d5w21migs9zajjw2nd1c5czj00nzw",
-  "hash": "sha256-/FsA5GeFhWYFl1L9pF+sQfDSyihTnweEdz2k8mtLqnY=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
deleted file mode 100644
index 9d898a553715..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
-  "rev": "362a8a41b265056592a0c3771664a21d23a71392",
-  "date": "2024-11-11T00:21:27-05:00",
-  "path": "/nix/store/5b0dbka0dnwzna233bd2gc0rydahvk0q-tree-sitter-c-sharp",
-  "sha256": "0w6xdb8m38brhin0bmqsdqggdl95xqs3lbwq7azm5gg94agz9qf1",
-  "hash": "sha256-weH0nyLpvVK/OpgvOjTuJdH2Hm4a1wVshHmhUdFq3XA=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
deleted file mode 100644
index 35988b2c081a..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-c",
-  "rev": "2a265d69a4caf57108a73ad2ed1e6922dd2f998c",
-  "date": "2025-02-08T10:48:10-06:00",
-  "path": "/nix/store/0xnd082cryjnml9iaibcfgbp3bc5svxb-tree-sitter-c",
-  "sha256": "1vw7jd3wrb4vnigfllfmqxa8fwcpvgp1invswizz0grxv249piza",
-  "hash": "sha256-6sebiNg9P/B/5HrbGO7bl3GHVMfVUepetJuszEeTh+8=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
deleted file mode 100644
index 47467756a54b..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/sogaiu/tree-sitter-clojure",
-  "rev": "e43eff80d17cf34852dcd92ca5e6986d23a7040f",
-  "date": "2025-08-26T15:59:05+09:00",
-  "path": "/nix/store/gpvw9wn3mg5j7mzj91qvkxm8l5rlgid6-tree-sitter-clojure",
-  "sha256": "0bmclmbjk58w8092q52yra5axrr3q22v73yva9wvqh5fif81x2cf",
-  "hash": "sha256-jokekIuuQLx5UtuPs4XAI+euispeFCwSQByVKVelrC4=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
deleted file mode 100644
index 419cfe5c0ca4..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/uyha/tree-sitter-cmake",
-  "rev": "cf9799600b2ba5e6620fdabddec3b2db8306bc46",
-  "date": "2025-05-23T09:02:01Z",
-  "path": "/nix/store/20nwq76zin7f8lhaccdhj4jm4yzvqclr-tree-sitter-cmake",
-  "sha256": "0mqkmdqw0x7b2a83is8w8va32s0qzf3dlfzx0hwxfz7rn5dn459v",
-  "hash": "sha256-OxViW7H5fNc5BP072ob7GGgx1EYc6TiQEut0wHGrE1c=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json
deleted file mode 100644
index ed34fe8a5d56..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "url": "https://github.com/stsewd/tree-sitter-comment",
-  "rev": "ef429992748f89e176243411e94b8ffc8777d118",
-  "date": "2023-06-03T20:48:17-05:00",
-  "path": "/nix/store/0kg71dvg10f1m2f08z1b2wh1ap4w4hw6-tree-sitter-comment",
-  "sha256": "1d5g69i8jplyg888yr7wzjb46cqnchwf4kdzgb83him7cwfx9wax",
-  "hash": "sha256-XfHUHWenRjjQer9N4jhkFjNDlvz8ZI8Qep5eiWIyr7Q=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json
deleted file mode 100644
index 3b056e466f03..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/thehamsta/tree-sitter-commonlisp",
-  "rev": "9db594efb43574c5fe4a1f880568b1f0d0ee6057",
-  "date": "2025-03-16T16:36:54+01:00",
-  "path": "/nix/store/96phqhn770ds8i0j0l88phldl7d03g72-tree-sitter-commonlisp",
-  "sha256": "0xg3ay8l62h7s35abkxi4gjfvndzdvvrpgh1z980q1ib5935sxf0",
-  "hash": "sha256-wHVdRiorBgxQ+gG+m/duv9nt5COxz6XK0AcKQ5FX43U=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
deleted file mode 100644
index ddee6bf64d8d..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-cpp",
-  "rev": "f41e1a044c8a84ea9fa8577fdd2eab92ec96de02",
-  "date": "2024-11-11T01:56:44-05:00",
-  "path": "/nix/store/9735qnyqvf3wcgiyr5wmbx8w0ggsksh5-tree-sitter-cpp",
-  "sha256": "0sbvvfa718qrjmfr53p8x3q2c19i4vhw0n20106c8mrvpsxm7zml",
-  "hash": "sha256-tP5Tu747V8QMCEBYwOEmMQUm8OjojpJdlRmjcJTbe2k=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-crystal.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-crystal.json
deleted file mode 100644
index 0085e157c80f..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-crystal.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/crystal-lang-tools/tree-sitter-crystal",
-  "rev": "f0ada43161f77d5bad18c4ce0b21d1dc9310e408",
-  "date": "2025-09-08T23:42:35-04:00",
-  "path": "/nix/store/q97l67605207fyavx1kdsnfylf49aj44-tree-sitter-crystal",
-  "sha256": "0j3xb6j67v4i4wdn14y1ac2004r71v4m0r01qfzhfv4cqwad3lz4",
-  "hash": "sha256-5NPRFMeMbAe/wwFkUMkOJxMABFPBk2AbJ5HsY6RZfUg=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
deleted file mode 100644
index 4054f5f8b63a..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-css",
-  "rev": "c0d581e32d183a536731ed6c3a72758b27e20411",
-  "date": "2025-01-11T19:52:10-05:00",
-  "path": "/nix/store/hdsw4wgq4rnp5nr6wjywmkhpa79b16my-tree-sitter-css",
-  "sha256": "0c5j9zyjcykmraix1agbc0gdk85zs2v379q0aykr10fi9w2r9z9c",
-  "hash": "sha256-LP2UBU/RgZCnVwCnM7bQv6DZHmDrqdCjynV6Jv1PsjA=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json
deleted file mode 100644
index 753f05604b87..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/thehamsta/tree-sitter-cuda",
-  "rev": "48b066f334f4cf2174e05a50218ce2ed98b6fd01",
-  "date": "2025-09-18T22:53:12+02:00",
-  "path": "/nix/store/01cw4243h6xyhg6nn8fgz7gjajkh0hjg-tree-sitter-cuda",
-  "sha256": "116fa26bjh6a88kdshqq5hp6fq4ik95dpaiidw8rn90xxwwl0zxi",
-  "hash": "sha256-sX9AOe8dJJsRbzGq20qakWBnLiwYQ90mQspAuYxQzoQ=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json
deleted file mode 100644
index 96ddd49800cf..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/eonpatapon/tree-sitter-cue",
-  "rev": "770737bcff2c4aa3f624d439e32b07dbb07102d3",
-  "date": "2025-02-03T09:13:36+01:00",
-  "path": "/nix/store/mavr89l8mjvpv866an6s60yyi18byimd-tree-sitter-cue",
-  "sha256": "19wqgzpd22b6f62ck4qs1dqibpcgxy6bgv8i2spc53m70cxq2d5s",
-  "hash": "sha256-ujSBOwOnjsKuFhHtt4zvj90VcQsak8mEcWYJ0e5/mKc=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
deleted file mode 100644
index f65fae97f629..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/usernobody14/tree-sitter-dart",
-  "rev": "80e23c07b64494f7e21090bb3450223ef0b192f4",
-  "date": "2025-02-28T15:18:07-07:00",
-  "path": "/nix/store/7pfv5380h2fwv0rg0ckdjg8h71vzq71f-tree-sitter-dart",
-  "sha256": "00wzdgmi6kph4lk988brpy03j43a8vvfcjx9plnnnk07a14l3hbc",
-  "hash": "sha256-bMFBSVAHTGstvalL5vZGahA5gL95IZQmJfBOE+trnwM=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json
deleted file mode 100644
index fe826138a3e0..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/joelspadin/tree-sitter-devicetree",
-  "rev": "07a647c8fb70e6b06379a60526721e3141aa2fd2",
-  "date": "2024-09-26T18:03:23-05:00",
-  "path": "/nix/store/xcv8715lvqg6ncs5z4idzzx4klprl0ca-tree-sitter-devicetree",
-  "sha256": "13rm15p9mrdklys0d720xy386pnvirxxjswg0wi1m87hs8i49qns",
-  "hash": "sha256-2uJEItLwoBoiB49r2XuO216Dhu9AnAa0p7Plmm4JNY8=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json
deleted file mode 100644
index def7d28b4a6b..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/camdencheek/tree-sitter-dockerfile",
-  "rev": "868e44ce378deb68aac902a9db68ff82d2299dd0",
-  "date": "2024-05-09T10:18:45-04:00",
-  "path": "/nix/store/mcyxjcriszp3av7pjxfqn9igpcxrd0jg-tree-sitter-dockerfile",
-  "sha256": "09iw9mqlpgsi6ak4mxrv16anvmbyap6vf61r2pi2lqdp9h1mp7g0",
-  "hash": "sha256-4J1bA0y3YSriFTkYt81VftVtlQk790qmMlG/S3FNPCY=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json
deleted file mode 100644
index 96e220464cd5..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/rydesun/tree-sitter-dot",
-  "rev": "9ab85550c896d8b294d9b9ca1e30698736f08cea",
-  "date": "2022-08-25T12:15:36+08:00",
-  "path": "/nix/store/p0lcm171skxdr4qbhqwl5slx76k9hap6-tree-sitter-dot",
-  "sha256": "013brrljrhgpnks1r0cdvj93l303kb68prm18gpl96pvhjfci063",
-  "hash": "sha256-w4DInIT7mkTvQ6Hmi8yaAww6ktyNgRz0tPfBLGnOawQ=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
deleted file mode 100644
index 9117f8c0ae71..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/glehmann/tree-sitter-earthfile",
-  "rev": "a37c5ee95ce401ca311c0ae1369d9cfb953e151d",
-  "date": "2025-05-13T08:33:41+02:00",
-  "path": "/nix/store/dhmdlbq30jfmsl719k8pawcffs8xpin0-tree-sitter-earthfile",
-  "sha256": "1gld2wrxa9bfhka70pnyapq7agwxh2mgwa7qj5mq8ga73gfi52lm",
-  "hash": "sha256-lYoS3RtHPYRrkfgo/qqAnT918FXeXnDUhG4l1TMXjb4=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json
deleted file mode 100644
index 0e7efcc84c04..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/connorlay/tree-sitter-eex",
-  "rev": "f742f2fe327463335e8671a87c0b9b396905d1d1",
-  "date": "2022-01-12T10:01:23-08:00",
-  "path": "/nix/store/an5vj0gnziy44ckklm9hxp9wbydisk4l-tree-sitter-eex",
-  "sha256": "19n07ywavwkh4p189d18wxhch45qgn094b7mkdymh60zr7cbmyjh",
-  "hash": "sha256-UPq62MkfGFh9m/UskoB9uBDIYOcotITCJXDyrbg/wKY=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json
deleted file mode 100644
index b8eb1a40bfe2..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/wilfred/tree-sitter-elisp",
-  "rev": "1991465e2722dd36c06e03dc7de6bc5d7da89d51",
-  "date": "2023-03-28T08:47:56-07:00",
-  "path": "/nix/store/mbb6q2yma6vszbzpw5hbpzf0iwg9y7vi-tree-sitter-elisp",
-  "sha256": "1m6lb60mlyk38pizcncp58f69kyf36b47rxnysf1l4193nscjqw6",
-  "hash": "sha256-hmPJtB0pEBqc9rbnQ5YZzs9kHCqXWfbjRWN6WoFZ1NQ=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
deleted file mode 100644
index 5af61d399026..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/elixir-lang/tree-sitter-elixir",
-  "rev": "86ec2ed45d6d9433b4e0b88cd3d96796bd45625f",
-  "date": "2025-02-07T01:27:08+07:00",
-  "path": "/nix/store/ng72gkvc7dfgir6gvxrd5l7vrzcq3zvh-tree-sitter-elixir",
-  "sha256": "12i0z8afdzcznn5dzrssr7b7jx4h7wss4xvbh3nz12j6makc7kzl",
-  "hash": "sha256-9M/DpqpGivDtgGt3ojU/kHR51sla59+KtZ/95hT6IIo=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json
deleted file mode 100644
index 4ff1421304f5..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/elm-tooling/tree-sitter-elm",
-  "rev": "c26afd7f2316f689410a1622f1780eff054994b1",
-  "date": "2023-12-22T17:42:34+01:00",
-  "path": "/nix/store/4f7ldbwxns2iv0cf06ryc87raiacdp5x-tree-sitter-elm",
-  "sha256": "1cbn5qiq2n607hcxg786jrhs2abln8fcsvkcab9wp9j8iw9pb0xx",
-  "hash": "sha256-vYN1E49IpsvTUmxuzRyydCmhYZYGndcZPMBYgSMudrE=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
deleted file mode 100644
index 6c6e366f9c6c..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-embedded-template",
-  "rev": "c70c1de07dedd532089c0c90835c8ed9fa694f5c",
-  "date": "2025-08-28T20:40:04-04:00",
-  "path": "/nix/store/l73zsvkpnrjpzncpwb4qcvhgqvx5zd35-tree-sitter-embedded-template",
-  "sha256": "0w1vkk1m2a52nqqx7agwcik7kbdb6bwpw18479inswqbgn51l54w",
-  "hash": "sha256-nBQain0Lc21jOgQFfvkyq615ZmT8qdMxtqIoUcOcO3A=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json
deleted file mode 100644
index 1aac15dac9f8..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/WhatsApp/tree-sitter-erlang",
-  "rev": "5dba13dcd531c19bf99829e2e0bb31f2e08e16fe",
-  "date": "2023-06-16T04:39:42-07:00",
-  "path": "/nix/store/m6f3qpkrcvj9ccmybq55ip3x33f3wkh5-tree-sitter-erlang",
-  "sha256": "123n9yb3g8fh27104n5bsmqpykv9wiqqj6hwn5cxx4rp9ls06zql",
-  "hash": "sha256-FH8DNE03k95ZsRwaiXHkaU9/cdWrWALCEdChN5ZPdog=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-factor.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-factor.json
deleted file mode 100644
index c7cde5b69b2d..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-factor.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/erochest/tree-sitter-factor",
-  "rev": "554d8b705df61864eb41a0ecf3741e94eb9f0c54",
-  "date": "2025-01-11T21:45:26-05:00",
-  "path": "/nix/store/yvyrq221kqwjq19hw6lf8xzxj6z080d8-tree-sitter-factor",
-  "sha256": "14yciinyczi7h8dny0cgk5ghlfwjlgz1zqndwrk260n1994k5bb7",
-  "hash": "sha256-Z60ySUrBAiNm5s3iH/6jkjsKX5mPAW8bgid+5m2MzJM=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json
deleted file mode 100644
index bc474c396b55..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/travonted/tree-sitter-fennel",
-  "rev": "36eb796a84b4f57bdf159d0a99267260d4960c89",
-  "date": "2025-09-06T23:17:11-04:00",
-  "path": "/nix/store/jz4l1j6yy6ly6pgjhmjrqq0lhab1gb8l-tree-sitter-fennel",
-  "sha256": "0pg76nby16i7wvvhc9n7ahbg4l4rlldzw7ggm8szlxx40lz16mv8",
-  "hash": "sha256-aFcTPgWkd/o1qu8d/hulmVDyFlTHJgb35iea4Jc1510=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json
deleted file mode 100644
index a6744378376d..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/ram02z/tree-sitter-fish",
-  "rev": "aa074a0bacde8b5823c592574d7138f156a95776",
-  "date": "2025-06-13T20:17:14+01:00",
-  "path": "/nix/store/8z4vmmfhxbc529rkjs84aij12xa8ag1w-tree-sitter-fish",
-  "sha256": "1l8qmmligfcpf4amqghdv9c4nvs5wbhiifhl7016l7793rfzl235",
-  "hash": "sha256-ZQj6XR7pHGoCOBS6GOHiRW9LWNoNPlwVcZe5F2mtGNE=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json
deleted file mode 100644
index cfc6a0ff44bd..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "url": "https://github.com/stadelmanma/tree-sitter-fortran",
-  "rev": "022b032d31299c5d8336cdfd0ece97de20a609c0",
-  "date": "2025-01-23T13:28:14-05:00",
-  "path": "/nix/store/vncpfx5db12ish9rzf26phj25373nqs4-tree-sitter-fortran",
-  "sha256": "1mncdji60qa9r8jbiywmcid714ylc3gniq25l8mxj1p4zq95nd29",
-  "hash": "sha256-STRbEv7kBtkrokXgaN9g1JNwWmSV+7gkyklhYKJszNY=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json
deleted file mode 100644
index 45f484e3fa86..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/prestonknopp/tree-sitter-gdscript",
-  "rev": "c370d711dc9ead679d40bb7e9364ceed0b3bfc28",
-  "date": "2025-07-17T11:29:39-07:00",
-  "path": "/nix/store/yzmn7h0mqpphjnwmrnnrijz6dmhl2rmq-tree-sitter-gdscript",
-  "sha256": "0qma5ffmfwh81dk4wafz9qqkqw6pyk18bg20sg70v7s3r7m0bq2b",
-  "hash": "sha256-S+AF6slDnw3O00C8hcL013A8MU7fKU5mCwhyV50rqmI=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gemini.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gemini.json
deleted file mode 100644
index f4206540b737..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gemini.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/blessanabraham/tree-sitter-gemini",
-  "rev": "3cc5e4bdf572d5df4277fc2e54d6299bd59a54b3",
-  "date": "2023-08-26T22:20:36+03:00",
-  "path": "/nix/store/ywwyjjaps1swpzy0hndllwka4rg8hbdb-tree-sitter-gemini",
-  "sha256": "1r965z6cls7ahipf9bpvcvpv4xda7k1j64lvnwf2bkb83qpakdc2",
-  "hash": "sha256-grWpLh5ozSUct5sSI8M8qnWy72b7ruRuhOpoyswvJuU=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json
deleted file mode 100644
index c8455e82214d..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/gleam-lang/tree-sitter-gleam",
-  "rev": "dae1551a9911b24f41d876c23f2ab05ece0a9d4c",
-  "date": "2025-07-21T17:56:49Z",
-  "path": "/nix/store/v0dwdaqlr17b6jry9ysd15m342ha8hxb-tree-sitter-gleam",
-  "sha256": "0d7z5bk6x0qi3wy4d8174a69wxsc4287c7fcdfabkn8dixpa920q",
-  "hash": "sha256-GIikbo8N2bmUa8wddpAgTHeejCInoEY8HxGDbuYq/zQ=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json
deleted file mode 100644
index 2c04f80d2f1e..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/alexlafroscia/tree-sitter-glimmer",
-  "rev": "51970d4bb249d918dbd26289cc4208bee4068004",
-  "date": "2024-08-20T13:58:19-04:00",
-  "path": "/nix/store/ff20fkmpcslz5b9883gk7q6nlri8x6qd-tree-sitter-glimmer",
-  "sha256": "135pf610rb5nppn5k5699z5azxa7zqvx17x6v5nrp7fdwsy0whg2",
-  "hash": "sha256-4kEOvObNnZtt2aaf0Df+R/Wvyk/JlFnsvbasDIJxt4w=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
deleted file mode 100644
index 2263a37af864..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/thehamsta/tree-sitter-glsl",
-  "rev": "e47b8b62b59d0e3529f1c31b03e025d6bd475044",
-  "date": "2025-03-16T18:14:20+01:00",
-  "path": "/nix/store/87vf9kgi9yzzksj0s7h707ky79kckf5f-tree-sitter-glsl",
-  "sha256": "0d0ymklms4a91b310f0vwl80yy50sji4qq9sdgly5qh42kyjnijb",
-  "hash": "sha256-S0Yr/RQE4uLpazphTKLUoHgPEOUbOBDGCkkRXemsHjQ=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json
deleted file mode 100644
index 1ea8ff82bfa9..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/ngalaiko/tree-sitter-go-template",
-  "rev": "65f4f86c3aaa9dabab36e3482584e8a111cf7db1",
-  "date": "2025-08-23T12:29:37Z",
-  "path": "/nix/store/f5palcms6bafi6yc77z2yqa3yhb0pbhz-tree-sitter-go-template",
-  "sha256": "1wf0fswkd1fd2f0x6xz2qqvr7sdyz3h93vac9z6jad41sqx4w9md",
-  "hash": "sha256-rSZOOtaBNCXNT0ztkeD4vumTN8bid9OBE82FNrl2wPE=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
deleted file mode 100644
index bff23a280218..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-go",
-  "rev": "1547678a9da59885853f5f5cc8a99cc203fa2e2c",
-  "date": "2025-08-29T02:17:40-04:00",
-  "path": "/nix/store/nb47mmxl1lwd2bgnv8w1m7zr04rpp326-tree-sitter-go",
-  "sha256": "0ag5cksnvrb8fg7b05pg1rq31sv6l8k985bk7qrzg91j7w8x7dnb",
-  "hash": "sha256-y7bTET8ypPczPnMVlCaiZuswcA7vFrDOc2jlbfVk5Sk=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json
deleted file mode 100644
index cb0e4e446359..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/prestonknopp/tree-sitter-godot-resource",
-  "rev": "a1a7295b376fbd2531601f4ffff191b031ffc795",
-  "date": "2025-05-14T13:16:54-07:00",
-  "path": "/nix/store/aiffb583jhinm3ph5l0pz70igyskdc4f-tree-sitter-godot-resource",
-  "sha256": "1jhl7fwrjd07y3bcmwc6v3lyq04yma49q575cgld94ssmcp0rmgs",
-  "hash": "sha256-+tUMLqtak9ToY+UUnIiqngDs6diG8crW8Ac0mbk7FMo=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json
deleted file mode 100644
index e03e7b89f738..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/camdencheek/tree-sitter-go-mod",
-  "rev": "3b01edce2b9ea6766ca19328d1850e456fde3103",
-  "date": "2024-09-11T15:20:34-06:00",
-  "path": "/nix/store/waxmvqpiild2qbkqx7kmkc60g08822b3-tree-sitter-go-mod",
-  "sha256": "1vbg4fn54a7lbwcrvjdx3nrwgw5y925chbbb7sd6kwms1434yyhb",
-  "hash": "sha256-C3pPBgm68mmaPmstyIpIvvDHsx29yZ0ZX/QoUqwjb+0=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json
deleted file mode 100644
index 4e5d2de4853c..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/omertuc/tree-sitter-go-work",
-  "rev": "949a8a470559543857a62102c84700d291fc984c",
-  "date": "2022-10-04T10:19:22+02:00",
-  "path": "/nix/store/v8ny6m450z2g2ijk6gkbc3m1nsxcvck8-tree-sitter-go-work",
-  "sha256": "1nn6nfw24v4m38g9ac528cn608bbxffkll1y525a7i9rdpnmx1sf",
-  "hash": "sha256-Tode7W05xaOKKD5QOp3rayFgLEOiMJUeGpVsIrizxto=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json
deleted file mode 100644
index f90c78ea33f1..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/bkegley/tree-sitter-graphql",
-  "rev": "5e66e961eee421786bdda8495ed1db045e06b5fe",
-  "date": "2021-05-10T09:09:29-05:00",
-  "path": "/nix/store/am2ld0br0yhdny5c2ndp6l0bl3c78wwq-tree-sitter-graphql",
-  "sha256": "0xvrd6p9rxdjpqfq575ap6hpl2f7dad5i4d4m05w1qk9jx33vw9n",
-  "hash": "sha256-NvE9Rpdp4sALqKSRWJpqxwl6obmqnIIdvrL1nK5peXc=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
deleted file mode 100644
index a78b0c4fe7e1..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-haskell",
-  "rev": "c30d812bc90827f1a54106a25bc9a6307f5cdcec",
-  "date": "2024-11-10T13:07:41-05:00",
-  "path": "/nix/store/a98r40cngmpvr1hrmxh6v404jhqlk6kf-tree-sitter-haskell",
-  "sha256": "0gpdv2w82w6qikp19ma2v916jg5ksh9i26q0lnd3bgbqnllif23f",
-  "hash": "sha256-bggXKbV4vTWapQAbERPUszxpQtpC1RTujNhwgbjY7T4=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json
deleted file mode 100644
index 738b02ffdb69..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "url": "https://github.com/MichaHoffmann/tree-sitter-hcl",
-  "rev": "636dbe70301ecbab8f353c8c78b3406fe4f185f5",
-  "date": "2023-07-25T19:21:31+02:00",
-  "path": "/nix/store/k5rmjfpgn4vpxxqc05xb5fflcck9645v-tree-sitter-hcl",
-  "sha256": "1yydi61jki7xpabi0aq6ykz4w4cya15g8rp34apb6qq9hm4lm9di",
-  "hash": "sha256-saVKSYUJY7OuIuNm9EpQnhFO/vQGKxCXuv3EKYOJzfs=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json
deleted file mode 100644
index 9ac36a85bcb3..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/connorlay/tree-sitter-heex",
-  "rev": "a63c69c20fd88d1e5614a02b4a6b48cfb7e54a45",
-  "date": "2025-01-16T08:02:36-05:00",
-  "path": "/nix/store/a73dii220p8jj60an971c330gxlx5cqp-tree-sitter-heex",
-  "sha256": "0d0ljmxrvmr8k1wc0hd3qrjzwb31f1jaw6f1glamw1r948dxh9xf",
-  "hash": "sha256-rifYGyIpB14VfcEZrmRwYSz+ZcajQcB4mCjXnXuVFDQ=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json
deleted file mode 100644
index 80b0b2a1f471..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/winston0410/tree-sitter-hjson",
-  "rev": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0",
-  "date": "2021-08-02T21:41:53+01:00",
-  "path": "/nix/store/cvbkxylvkpgxcmkv87fvknlfxg4q09bg-tree-sitter-hjson",
-  "sha256": "0zqf4bxqd2bpzdsw4kghq0jmn7l4sgdlrrlhc567b03p6kfdzi1n",
-  "hash": "sha256-NsTf3DR3gHVMYZDmTNvThB5bJcDwTcJ1+3eJhvsiDn8=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
deleted file mode 100644
index 57e69ad93101..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-html",
-  "rev": "5a5ca8551a179998360b4a4ca2c0f366a35acc03",
-  "date": "2024-11-11T00:55:18-05:00",
-  "path": "/nix/store/9wnjgv4nvkmq8n645ql8hmisz5h54nnq-tree-sitter-html",
-  "sha256": "0slhrmwcw2xax4ylyaykx4libkzlaz2lis8x8jmn6b3hbdxlrpix",
-  "hash": "sha256-Pd5Me1twLGOrRB3pSMVX9M8VKenTK0896aoLznjNkGo=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json
deleted file mode 100644
index 66a8fdf28dfa..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/ntbbloodbath/tree-sitter-http",
-  "rev": "b88cd0c7dba0128b8f28fcb25cca13eea0d193b3",
-  "date": "2024-08-21T01:10:49+09:00",
-  "path": "/nix/store/l6knlfkxvh3dnmc2asism5qr0xdsfna4-tree-sitter-http",
-  "sha256": "0k6rkpjjzs3jxgwljya3rjnzz0cpi68bm1xfpar2kf71fydd03m6",
-  "hash": "sha256-pg7QmnfhuCmyuq6HupCJl4H/rcxDeUn563LoL+Wd2Uw=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hyprlang.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hyprlang.json
deleted file mode 100644
index f63d8243613a..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hyprlang.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter-grammars/tree-sitter-hyprlang",
-  "rev": "86025136c12cd1058985479a6b1935829077f1af",
-  "date": "2024-02-10T18:00:17+03:00",
-  "path": "/nix/store/q5csx65ydwbz66bgjjpa6c1yvy3zy6vq-tree-sitter-hyprlang",
-  "sha256": "0z84nl1mb77rwqq86ggaiqdd2lwg3nxrlkbhsn8zhcqnaphq0wfl",
-  "hash": "sha256-1HGA4VUWM/iR1XBNmrsdj1PRGo7qPYMw5vmcVQO1BH0=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
deleted file mode 100644
index 99fa73b63fb5..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/sogaiu/tree-sitter-janet-simple",
-  "rev": "7e28cbf1ca061887ea43591a2898001f4245fddf",
-  "date": "2025-05-19T21:38:53+09:00",
-  "path": "/nix/store/k9njvidvlpqlri2dsmfvz3h21b1214a6-tree-sitter-janet-simple",
-  "sha256": "05xn760xxax8q2dsvyj3yw90rhnq7nmv54p0i8af34nhjwyi8sx9",
-  "hash": "sha256-qWsUPZfQkuEUiuCSsqs92MIMEvdD+q2bwKir3oE5thc=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
deleted file mode 100644
index adad6e67b406..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-java",
-  "rev": "94703d5a6bed02b98e438d7cad1136c01a60ba2c",
-  "date": "2024-12-21T13:21:37-05:00",
-  "path": "/nix/store/y4x8qyssrxlcpmjxza0n3fpjlp1nh13y-tree-sitter-java",
-  "sha256": "11j4ifhl5hsmb2sa651cp5xds9cjgjynl86yivvk6bnr2ba0xw9s",
-  "hash": "sha256-OvEO1BLZLjP3jt4gar18kiXderksFKO0WFXDQqGLRIY=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
deleted file mode 100644
index 964acc360643..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-javascript",
-  "rev": "44c892e0be055ac465d5eeddae6d3e194424e7de",
-  "date": "2025-09-01T03:10:57-04:00",
-  "path": "/nix/store/l0h8gv70fj33dqcpkpclbv0khjgnhk8z-tree-sitter-javascript",
-  "sha256": "1qdjpfxw9z1icx3jc3k006yj76lcqydkvbk4ji3wk4xy854zz66q",
-  "hash": "sha256-2Jj/SUG+k8lHlGSuPZvHjJojvQFgDiZHZzH8xLu7suE=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
deleted file mode 100644
index a3d1f78d20cd..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-jsdoc",
-  "rev": "658d18dcdddb75c760363faa4963427a7c6b52db",
-  "date": "2025-09-13T00:24:14-04:00",
-  "path": "/nix/store/l7zh6vli87n3bj7cq9lnfklkcwsay1am-tree-sitter-jsdoc",
-  "sha256": "1qrgan1xpj717qmwdbgb3lqjgffyhsw0qxhjwhdhqfv2lgkw4cn6",
-  "hash": "sha256-xjLC56NiOwwb5BJ2DLiG3rknMR3rrcYrPuHI24NVL+M=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
deleted file mode 100644
index ea3673775726..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-json",
-  "rev": "ee35a6ebefcef0c5c416c0d1ccec7370cfca5a24",
-  "date": "2024-11-11T01:00:59-05:00",
-  "path": "/nix/store/1a2z29149h46rlb9s9wkr1ln52qh7hm1-tree-sitter-json",
-  "sha256": "0p0fiqi5imxm13s1fs6bhqw6v11n79ri1af3d072zm7jqkcl5mhc",
-  "hash": "sha256-DNZC2cTy1C8OaMOpEHM6NoRtOIbLaBf0CLXXWCKODlw=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json
deleted file mode 100644
index 5c8bcfa51b89..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/joakker/tree-sitter-json5",
-  "rev": "8cb4114a4d7e5bab75d74466422e032de31d83df",
-  "date": "2025-09-20T19:19:04-03:00",
-  "path": "/nix/store/gmjjsjdj4xrkw89zq1asva5pdw455dnd-tree-sitter-json5",
-  "sha256": "0ckxr80dbzaxkasn9dldwcl0klkyxs8kiiqibk82y9mx8x2ymz21",
-  "hash": "sha256-QfzqRUe9Ji/QXBHHOJHuftIJKOONtmS1ml391QDKfTI=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json
deleted file mode 100644
index 5194ddd86da7..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/sourcegraph/tree-sitter-jsonnet",
-  "rev": "ddd075f1939aed8147b7aa67f042eda3fce22790",
-  "date": "2024-08-15T10:26:01+02:00",
-  "path": "/nix/store/l4ypaa5lbid6qk21kb4b4x6vh6ki97rq-tree-sitter-jsonnet",
-  "sha256": "1bfdjxp0h95d124bzlhlvc9b5q19cdj716aym41nyl6z5a992c9q",
-  "hash": "sha256-ODGRkirfUG8DqV6ZcGRjKeCyEtsU0r+ICK0kCG6Xza0=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
deleted file mode 100644
index c38a9d18fead..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-julia",
-  "rev": "a8e1262997d5a45520a06cbe1b86c0737d507054",
-  "date": "2024-11-11T00:25:28-05:00",
-  "path": "/nix/store/qrhmhag6j88rv7qg7nk1ya1rk5skyppj-tree-sitter-julia",
-  "sha256": "0xi04a48ly438gar25bkkvvr8by4dd013cnafbjdysqjfs04q2wg",
-  "hash": "sha256-jwtMgHYSa9/kcsqyEUBrxC+U955zFZHVQ4N4iogiIHY=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
deleted file mode 100644
index b84d6322d66f..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/IndianBoy42/tree-sitter-just",
-  "rev": "bb0c898a80644de438e6efe5d88d30bf092935cd",
-  "date": "2025-01-05T22:55:31Z",
-  "path": "/nix/store/jvkr4jxfrv3nps36v4qnry831kvhgx5v-tree-sitter-just",
-  "sha256": "15bx2v03a4d9f7dzhc5y2pkzlfsibrim8np1n9iqxvwizlgjw08p",
-  "hash": "sha256-FwEuH/2R745jsuFaVGNeUTv65xW+MPjbcakRNcAWfZU=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json
deleted file mode 100644
index 78b834fb5824..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter-grammars/tree-sitter-kdl",
-  "rev": "3ca569b9f9af43593c24f9e7a21f02f43a13bb88",
-  "date": "2023-05-13T01:55:45-04:00",
-  "path": "/nix/store/gmz9dnqxagdk59hqz7n9cyg43n7v0x93-tree-sitter-kdl",
-  "sha256": "1015x24ffrvzb0m0wbqdzmaqavpnjw0gvcagxi9b6vj3n1ynm0ps",
-  "hash": "sha256-+oJqfbBDbrNS7E+x/QCX9m6FVf0NLw4qWH9n54joJYA=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json
deleted file mode 100644
index 7a61e28411f1..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/mtoohey31/tree-sitter-koka",
-  "rev": "6dce132911ac375ac1a3591c868c47a2a84b30aa",
-  "date": "2025-07-26T15:26:41-04:00",
-  "path": "/nix/store/xvk32hz6j2yidxq4sj78phs4i1mqlwv8-tree-sitter-koka",
-  "sha256": "1l50l8m3ql2j6q772pgb8x3v1awvng12fd9rpv6p3cva1mg9ywj1",
-  "hash": "sha256-QXKfXg1qs3HNvjk1J8Kzm6uwR0frXXEONlJQPCqioNA=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json
deleted file mode 100644
index 304b38c8f162..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/fwcd/tree-sitter-kotlin",
-  "rev": "e1a2d5ad1f61f5740677183cd4125bb071cd2f30",
-  "date": "2024-08-03T01:29:18+02:00",
-  "path": "/nix/store/jppx5kglmzyh10qmy13d5948hl68lxvc-tree-sitter-kotlin",
-  "sha256": "0bv21rcypi9dx87kgfr89mg8qfc7ik1g1fcb8am7ss17by8badwk",
-  "hash": "sha256-kze1kF8naH2qQou58MKMhzmMXk0ouzcP6i3F61kOYi8=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json
deleted file mode 100644
index 87bac66f83d0..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/latex-lsp/tree-sitter-latex",
-  "rev": "7e0ecdc02926c7b9b2e0c76003d4fe7b0944f957",
-  "date": "2025-09-19T09:03:38+02:00",
-  "path": "/nix/store/jn7pw9992kbriq3z7nv27jh9yknqjsfq-tree-sitter-latex",
-  "sha256": "0sxxydq0lmfybvwfkzkvy5mp8hyqmadpl6pqxwqb5h6s44wnkgcx",
-  "hash": "sha256-nb1pOSHawLIw7/gaepuq2EN0a/F7/un4Xt5VCnDzvWs=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json
deleted file mode 100644
index 840281cc9ac5..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/cbarrete/tree-sitter-ledger",
-  "rev": "96c92d4908a836bf8f661166721c98439f8afb80",
-  "date": "2025-05-04T15:50:31-04:00",
-  "path": "/nix/store/jxnv96mxkypk3hkpy14hlw0yv60ryfsm-tree-sitter-ledger",
-  "sha256": "0g4yh8xxmcf7r0acazmzp4j08c6fx3d25b76i7fgchv7id658v1g",
-  "hash": "sha256-L2xUTItnQ/bcieasItrozjAEJLm/fsUUyMex2juCnjw=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json
deleted file mode 100644
index e63f2032140e..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "url": "https://github.com/benwilliamgraham/tree-sitter-llvm",
-  "rev": "c14cb839003348692158b845db9edda201374548",
-  "date": "2024-10-07T15:28:34-07:00",
-  "path": "/nix/store/aravnn08ip3zggkbww6ap73xb5zvrf6g-tree-sitter-llvm",
-  "sha256": "1fh5nq7war87zrphlv5v2g55gmsbhyv3385va7k1y8gh3czg0x9g",
-  "hash": "sha256-L3XwPhvwIR/mUbugMbaHS9dXyhO7bApv/gdlxQ+2Bbo=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
deleted file mode 100644
index 443c60090119..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/MunifTanjim/tree-sitter-lua",
-  "rev": "4fbec840c34149b7d5fe10097c93a320ee4af053",
-  "date": "2025-05-16T19:32:03+02:00",
-  "path": "/nix/store/3x9qgcifbb12l80kxq57sz8l3xzrq35k-tree-sitter-lua",
-  "sha256": "1fvfbi5csn3w0zjjr29c05gdhjmy6d8cx1d6s38j6qmfasm1gvvw",
-  "hash": "sha256-fO8XqlauYiPR0KaFzlAzvkrYXgEsiSzlB3xYzUpcbrs=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json
deleted file mode 100644
index 46a604c4a472..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/alemuller/tree-sitter-make",
-  "rev": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd",
-  "date": "2021-12-16T17:14:17Z",
-  "path": "/nix/store/v01s3lfi1w3bm433gf6zi0wb0r603906-tree-sitter-make",
-  "sha256": "07gz4x12xhigar2plr3jgazb2z4f9xp68nscmvy9a7wafak9l2m9",
-  "hash": "sha256-qQqapnKKH5X8rkxbZG5PjnyxvnpyZHpFVi/CLkIn/x0=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json
deleted file mode 100644
index 250b848c1bdf..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "url": "https://github.com/MDeiml/tree-sitter-markdown",
-  "rev": "1c8dea73bc0c996d92dd9ebc30dd388716b1c5db",
-  "date": "2024-09-11T16:28:36+03:00",
-  "path": "/nix/store/g4696miy9vzcw0qwd00rar36qn08jn2l-tree-sitter-markdown",
-  "sha256": "13xfyclim1yql6swbk4y12sxgvn799ldbzjl35n5rrkz7wgnwm9s",
-  "hash": "sha256-OlVuHz9/5lxsGVT+1WhKx+7XtQiezMW1odiHGinzro8=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-netlinx.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-netlinx.json
deleted file mode 100644
index c9793de08e6c..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-netlinx.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/norgate-av/tree-sitter-netlinx",
-  "rev": "296c0e62cd507fc23cd1f1db06142f808483cf1a",
-  "date": "2025-05-11T11:31:14+01:00",
-  "path": "/nix/store/yi7az5hhp3dmn5mbk2cin6m5pmbp5fby-tree-sitter-netlinx",
-  "sha256": "09q2w9g4bb8v603b4ykxn5g8ndqjfhrgskslsmzhy095r3jysb2q",
-  "hash": "sha256-WCzt5cglAQ9/1VRP/TJ0EjeLXrF9erIGMButRV7iAic=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json
deleted file mode 100644
index 4e96fa190a1e..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/nickel-lang/tree-sitter-nickel",
-  "rev": "ddaa2bc22355effd97c0d6b09ff5962705c6368d",
-  "date": "2024-10-01T17:50:53+02:00",
-  "path": "/nix/store/gwlzg1pxrb75s7bqza2g94d9ad30j20f-tree-sitter-nickel",
-  "sha256": "1dzjrn4lrdr0ncx9s5lkzb066dhpscs3jn63jabmgyv3wbh3kgcc",
-  "hash": "sha256-jL054OJj+1eXksNYOTTTFzZjwPqTFp06syC3TInN8rc=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
deleted file mode 100644
index 7c69366c118c..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/nix-community/tree-sitter-nix",
-  "rev": "ff4e2b4c5a3598e8be3edf16bc69f6677af32145",
-  "date": "2025-08-11T14:30:35Z",
-  "path": "/nix/store/pv5yjrasf1k8pigwl0gnvbm7bwsg205q-tree-sitter-nix",
-  "sha256": "0bv38na2i53229lzkndbvchfgg8gmwdgpcw1ajq9rcqar8m1gyal",
-  "hash": "sha256-VPkXKsoKs5ywVIGz+xqvD73nINur2flpEmKUKJRFYy8=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json
deleted file mode 100644
index 6c96638394e3..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/nvim-neorg/tree-sitter-norg-meta",
-  "rev": "6f0510cc516a3af3396a682fbd6655486c2c9d2d",
-  "date": "2024-04-13T19:12:46+02:00",
-  "path": "/nix/store/val14j7fz39yyqzp3xh2r7cbvfd1am4m-tree-sitter-norg-meta",
-  "sha256": "1vz74wc5yy5fykl9c3b16k6fsvskxp93acsy81p337jzg709v97j",
-  "hash": "sha256-8qSdwHlfnjFuQF4zNdLtU2/tzDRhDZbo9K54Xxgn5+8=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
deleted file mode 100644
index d4cb96ea314e..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/nvim-neorg/tree-sitter-norg",
-  "rev": "d89d95af13d409f30a6c7676387bde311ec4a2c8",
-  "date": "2024-09-04T16:57:27+02:00",
-  "path": "/nix/store/5kp8p7s80rvimcqs3i8syjwsc4459nmf-tree-sitter-norg",
-  "sha256": "077rds0rq10wjywpj4hmmq9dd6qp6sfwbdjyh587laldrfl7jy6g",
-  "hash": "sha256-z3h5qMuNKnpQgV62xZ02F5vWEq4VEnm5lxwEnIFu+Rw=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
deleted file mode 100644
index b07ea1915d63..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/nushell/tree-sitter-nu",
-  "rev": "0e6c59c46db3c246eaf86ce5b325da1247e971a5",
-  "date": "2025-09-19T12:13:52-05:00",
-  "path": "/nix/store/hzys3qbx0162dma003g6n4wzl5j8b4d1-tree-sitter-nu",
-  "sha256": "1l6l4s6w5dc1yrdwz9k1l4xzdzbkch8q4fr69461piibsd6r0qm8",
-  "hash": "sha256-qGKQTdMrxhsMSSY7ghFkc/32O6Fhps9b9oG1wo0m1NA=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
deleted file mode 100644
index fe29aa1e29cc..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-ocaml",
-  "rev": "0cc270ff90ca09c29d0f2f9dec69ddfef55a3eff",
-  "date": "2025-05-29T16:15:06+02:00",
-  "path": "/nix/store/796cycklipmf50nxh0431jfdlard661i-tree-sitter-ocaml",
-  "sha256": "1mrqpdzwrj3hkrv0xib3h3fvj9z3iai5gjwry9dilhdjl2n2akvv",
-  "hash": "sha256-e08lrKCyQRpb8pnLV6KK4ye53YBjxQ52nnDIzH+7ONc=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json
deleted file mode 100644
index 792216e7f848..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/milisims/tree-sitter-org",
-  "rev": "64cfbc213f5a83da17632c95382a5a0a2f3357c1",
-  "date": "2023-06-19T18:05:11-04:00",
-  "path": "/nix/store/9hdl3i24q6af6wxmkg89ww4rwkl45la7-tree-sitter-org",
-  "sha256": "1l62p4a3b22pa7b5mzmy497pk5b8w01hx6zinfwpbnzg2rjdwkgz",
-  "hash": "sha256-/03eZBbv23W5s/GbDgPgaJV5TyK+/lrWUVeINRS5wtA=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json
deleted file mode 100644
index cdaf509a9ca8..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/ganezdragon/tree-sitter-perl",
-  "rev": "8b554de277956a96f3e618b727d0ed4d4e564676",
-  "date": "2024-05-26T14:22:34Z",
-  "path": "/nix/store/fr9iacwd8dx2pb138d1q17wk9s64xvw3-tree-sitter-perl",
-  "sha256": "1ib0vx5dqp54ycisqg2gw72dj2ygin0z4846m2jnckavs7awn6fm",
-  "hash": "sha256-1RnL1dFbTWalqIYg8oGNzwvZxOFPPKwj86Rc3ErfYMU=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json
deleted file mode 100644
index 56a78fac161a..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/rolandwalker/tree-sitter-pgn",
-  "rev": "c5de0ccc528e1c36d354c00df422ed39fc582073",
-  "date": "2025-07-29T11:58:18-04:00",
-  "path": "/nix/store/laqz0v4pk90hqiy6apbxjf2lhbrf9n2h-tree-sitter-pgn",
-  "sha256": "0mazy9y80pd20a3a76b0nfxswh7xxdsnya0y0lzl86sh4w95f52p",
-  "hash": "sha256-VxRXEidQG0Q/BR4ob3Xr/UCuu7NgmaOGAqJdgHzyX1U=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
deleted file mode 100644
index 86b2f91a6705..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-php",
-  "rev": "5b5627faaa290d89eb3d01b9bf47c3bb9e797dea",
-  "date": "2025-08-18T00:11:55-05:00",
-  "path": "/nix/store/sxyqch4xwnm2a1g5r7h9drp4x9bszzi8-tree-sitter-php",
-  "sha256": "1zf98g6zn29xci37scp3bmjl9dynhf3272aaqm6znjq7rb6z53lc",
-  "hash": "sha256-jI7yzcoHS/tNxUqJI4aD1rdEZV3jMn1GZD0J+81Dyf0=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json
deleted file mode 100644
index 040c110a9b17..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/leo60228/tree-sitter-pioasm",
-  "rev": "afece58efdb30440bddd151ef1347fa8d6f744a9",
-  "date": "2024-10-11T21:14:24-04:00",
-  "path": "/nix/store/zhxnnjc6a8bc7dwvb7i20dxbjrv9fnj3-tree-sitter-pioasm",
-  "sha256": "0gz5632nlhi085sn5yh968qpyk17shifkhz9mai92g73byaahjxd",
-  "hash": "sha256-rUuolF/jPJGiqunD6SLUJ0x/MTIJ+mJ1QSBCasUw5T8=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json
deleted file mode 100644
index e5229a3327c3..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/victorhqc/tree-sitter-prisma",
-  "rev": "4e8ea36ed2138166cf0edc7ff91f092a3497a147",
-  "date": "2025-01-24T15:28:23+01:00",
-  "path": "/nix/store/hwhm7jw1k8cxmf4z4ldsq658xngzlg0a-tree-sitter-prisma",
-  "sha256": "144l2w7ky5imd7yvp1n6lgbyy5kq6kx4c2ja43yk15k3258pf52v",
-  "hash": "sha256-WxR3URFjljD9IEoKRvo0eBbv16PGhrv9aTUWPw8XlJA=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json
deleted file mode 100644
index 98175e48e9d3..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/mitchellh/tree-sitter-proto",
-  "rev": "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f",
-  "date": "2021-06-12T09:29:04-07:00",
-  "path": "/nix/store/dsfx2jxc6nll0324pl3w6qcdv5acvyj5-tree-sitter-proto",
-  "sha256": "001y2z2683fagryqj5f0gs3rcgx2nbw3x3r9afydhss80ihb8zvi",
-  "hash": "sha256-cX+0YARIa9i8UymPPviyoj+Wh37AFYl9fsoNZMQXPgA=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json
deleted file mode 100644
index eccf11601570..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/zealot128/tree-sitter-pug",
-  "rev": "13e9195370172c86a8b88184cc358b23b677cc46",
-  "date": "2024-11-17T14:49:11+01:00",
-  "path": "/nix/store/37aiadjp8j15bibqg4h4jpi969zg3z9w-tree-sitter-pug",
-  "sha256": "0pvrpnwbr04bq7hp4vm0k8ivnbnk66f1awlvby83z5s5zw36hkb2",
-  "hash": "sha256-Yk1oBv9Flz+QX5tyFZwx0y67I5qgbnLhwYuAvLi9eV8=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
deleted file mode 100644
index 91102dc7402b..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-python",
-  "rev": "293fdc02038ee2bf0e2e206711b69c90ac0d413f",
-  "date": "2025-09-11T02:45:17-04:00",
-  "path": "/nix/store/zka1fqm6l03k2z4ghiffkcisvcw96d5m-tree-sitter-python",
-  "sha256": "05kk1wlm5fgpgwqxw3m68sipkinw0gf2jq19cgq9cgp3agdwg58p",
-  "hash": "sha256-F5XH21PjPpbwYylgKdwD3MZ5o0amDt4xf/e5UikPcxY=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
deleted file mode 100644
index 6a433a1b517f..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-ql-dbscheme",
-  "rev": "15baf01feb5f20bb3d668d27abc0a36e944b183f",
-  "date": "2024-11-10T23:41:29-05:00",
-  "path": "/nix/store/9bmzx5bc247dir7skgb8jh3hqh3wvw53-tree-sitter-ql-dbscheme",
-  "sha256": "0wgaa0zsb9n4vf6na5znkb4vwrnw1ha9xqzi8w72bk7kipwfcwcm",
-  "hash": "sha256-lXHm+I3zzCUOR/HjnhQM3Ga+yZr2F2WN28SmpT9Q6nE=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
deleted file mode 100644
index 2741011aa215..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-ql",
-  "rev": "1fd627a4e8bff8c24c11987474bd33112bead857",
-  "date": "2024-11-10T23:34:04-05:00",
-  "path": "/nix/store/q8zbiszrsnrvpl9q2m88kzr2hm5a621l-tree-sitter-ql",
-  "sha256": "18kvspj7kqmm0bv1prnzx68xvkhcawj5xa12da9makv69y7xp7wq",
-  "hash": "sha256-mJ/bj09mT1WTaiKoXiRXDM7dkenf5hv2ArXieeTVe6I=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json
deleted file mode 100644
index 4c2825dafb4e..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "url": "https://github.com/nvim-treesitter/tree-sitter-query",
-  "rev": "0555ac0da902abff06076e40501102cee3ba68bd",
-  "date": "2025-02-02T17:30:49+01:00",
-  "path": "/nix/store/ab5v1pf3vckwhnix7r0c1l5g8x30v4zl-tree-sitter-query",
-  "sha256": "0dqy7i2jdd9dqf1ppqzcmkzd9yndb11r78l0pv1zyl7dm7h5g76q",
-  "hash": "sha256-2JxX4KntUP/DvoCik0NYzfrU/qzs43uDwy21JkU8Hjc=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
deleted file mode 100644
index 76b2d4f83d4a..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/r-lib/tree-sitter-r",
-  "rev": "e9944e9801595ad484f49be492daf0c4c81547ef",
-  "date": "2025-06-05T15:17:25-04:00",
-  "path": "/nix/store/qdqwb87naqr211y5zps16abnv97a3430-tree-sitter-r",
-  "sha256": "15g5bkndhqv8vbiakl1vvsarl4kcqz3k9fc9hgnn899ghla8nh2a",
-  "hash": "sha256-SkCLFIUvJWTtg4m5NMfHbBKald470Kni2mhj2Oxc5ZU=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-razor.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-razor.json
deleted file mode 100644
index 6905f4145aaf..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-razor.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-razor",
-  "rev": "60edbd8e798e416f5226a746396efa6a8614fa9b",
-  "date": "2016-07-08T15:17:50-07:00",
-  "path": "/nix/store/2vkxw48wc0xf07awi65r4rg2m1lpqq6c-tree-sitter-razor",
-  "sha256": "1ldsn9nxldxkxdy7irywx88d6a56q05f6907lypzass07piyqp2i",
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
deleted file mode 100644
index 27aca2758514..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-regex",
-  "rev": "b2ac15e27fce703d2f37a79ccd94a5c0cbe9720b",
-  "date": "2025-09-13T00:57:50-04:00",
-  "path": "/nix/store/wx4xlyvffsgkvjy88r955f5lrps9r1iz-tree-sitter-regex",
-  "sha256": "0nhn94skvac3wid2xbxa456m1mgbi7h768imq280pxbm4klhl7bd",
-  "hash": "sha256-bR0K6SR19QuQwDUic+CJ69VQTSGqry5a5IOpPTVJFlo=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json
deleted file mode 100644
index df313c6d6f4c..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/FallenAngel97/tree-sitter-rego",
-  "rev": "20b5a5958c837bc9f74b231022a68a594a313f6d",
-  "date": "2024-06-12T18:01:13+03:00",
-  "path": "/nix/store/dhpxdwhiwc6dl3gys99g3ax5jmg6s7fw-tree-sitter-rego",
-  "sha256": "0cmja3gd5nbmi251qc14hh1cbfd7i0mydx74qxs30qvix6q5a2az",
-  "hash": "sha256-XwlVsOlxYzB0x+T05iuIp7nFAoQkMByKiHXZ0t5QsjI=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json
deleted file mode 100644
index 87bf364f26d7..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/grafana/tree-sitter-river",
-  "rev": "eafcdc5147f985fea120feb670f1df7babb2f79e",
-  "date": "2023-11-22T14:48:13+01:00",
-  "path": "/nix/store/6wwv45dv3lgyzng2hryadamp061yzx4i-tree-sitter-river",
-  "sha256": "0acgxdgdffya5jc8d9ck2xrac0gi41w1a85cm91vwbm1xwxqh6vy",
-  "hash": "sha256-fhuIO++hLr5DqqwgFXgg8QGmcheTpYaYLMo7117rjyk=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json
deleted file mode 100644
index bf815e548d2a..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/stsewd/tree-sitter-rst",
-  "rev": "25e6328872ac3a764ba8b926aea12719741103f1",
-  "date": "2022-08-26T17:09:42-05:00",
-  "path": "/nix/store/y831a05hzw8dsajijwkahgwwcf4ima8l-tree-sitter-rst",
-  "sha256": "0f53jmpjh2kcl9srwwwb7a5k24729ig96m87qjj99myqfnzahw43",
-  "hash": "sha256-g3CovnXY15SkxAdVk15M4hAxizqLc551omwKKG+Vozg=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
deleted file mode 100644
index b39f33c3a159..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-ruby",
-  "rev": "71bd32fb7607035768799732addba884a37a6210",
-  "date": "2024-11-10T23:48:17-05:00",
-  "path": "/nix/store/d3r6c4r9691zy7dxx9v009p7xwnl3wln-tree-sitter-ruby",
-  "sha256": "0c1vs63ydcb3q2wnif18l5irbj6chkcvd3p6dg0vyhklk5acrvca",
-  "hash": "sha256-iu3MVJl0Qr/Ba+aOttmEzMiVY6EouGi5wGOx5ofROzA=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
deleted file mode 100644
index 5cfe2a766547..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-rust",
-  "rev": "cad8a206f2e4194676b9699f26f6560d07130d3f",
-  "date": "2024-11-24T13:48:58-05:00",
-  "path": "/nix/store/2xxvslz0q5vl8z94hs1g8cb4x2ri2pan-tree-sitter-rust",
-  "sha256": "1xxxysiwj0r97sp4wsdmm23pcgsngiw39gsa9jm0achan6basgv9",
-  "hash": "sha256-aT+tlrEKMgWqTEq/NHh8Vj92h6i1aU6uPikDyaP2vfc=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
deleted file mode 100644
index 1b06a4e99317..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-scala",
-  "rev": "2d55e74b0485fe05058ffe5e8155506c9710c767",
-  "date": "2025-06-08T14:05:03-04:00",
-  "path": "/nix/store/0ns5c1i34vlyrbvyajclw5dc0qyqmx0c-tree-sitter-scala",
-  "sha256": "16674bmcwp0r8y9xgfc0n5jmgk9bb0975kcqhkg1pnprjs7b6kv4",
-  "hash": "sha256-ZE+zjpb52hvehJjNchJYK81XZbGAudeTRxlczuoix5g=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json
deleted file mode 100644
index c85551d0a92b..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/6cdh/tree-sitter-scheme",
-  "rev": "67b5c8d6ce19fd5265f13204fec0a3efa9e095d9",
-  "date": "2025-09-17T19:40:43+08:00",
-  "path": "/nix/store/019pq24f1wpqi9n9z5h3ih4w83am5sp4-tree-sitter-scheme",
-  "sha256": "12z3grdc92cvdvkcbk981nn976fscmdbc4fhrsrq2q0h03wfqcwy",
-  "hash": "sha256-njPs+AAQYIGzztARtlpl2pmTrA0ozcXmbpuJxFp+44s=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json
deleted file mode 100644
index 512d80fbbb50..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/serenadeai/tree-sitter-scss",
-  "rev": "c478c6868648eff49eb04a4df90d703dc45b312a",
-  "date": "2022-02-03T21:48:21Z",
-  "path": "/nix/store/s49l3jbhjni3l1d0m3xrpzml39aq9yr3-tree-sitter-scss",
-  "sha256": "15r3jiv36hzx2pmjmp63am3pbc01s52z36xfraa1aw4wlx7lqnq4",
-  "hash": "sha256-BFtMT6eccBWUyq6b8UXRAbB1R1XD3CrrFf1DM3aUI5c=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-slint.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-slint.json
deleted file mode 100644
index 1ebd0fab512f..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-slint.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/slint-ui/tree-sitter-slint",
-  "rev": "96bc969d20ff347030519184ea2467f4046a524d",
-  "date": "2025-07-13T19:36:58Z",
-  "path": "/nix/store/vns80yp0k4hpjrdxyasbijnj1q2v1rlf-tree-sitter-slint",
-  "sha256": "0q55q7rjf53jvhdxxr4qbnxwi5j1vxbda6g9pw18swn11nw72dn9",
-  "hash": "sha256-yTZxuA3Bco0Cv+kZ1VbfQZbIu12Y5N4b3HIUJ/PBpWA=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json
deleted file mode 100644
index 787003e93392..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/indoorvivants/tree-sitter-smithy",
-  "rev": "cf8c7eb9faf7c7049839585eac19c94af231e6a0",
-  "date": "2023-01-31T21:16:56Z",
-  "path": "/nix/store/y5j99bx1b6h25k1lnzs6s4gkg0mhll06-tree-sitter-smithy",
-  "sha256": "0k7gfpa3pcj1ji34k0kwk1xbadkgjadfg36xfwns1fmlwzmr7jnx",
-  "hash": "sha256-3cqT6+e0uqAtd92M55qSbza1eph8gklGlEGyO9R170w=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sml.json
deleted file mode 100644
index 84ff9fad58c7..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sml.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/MatthewFluet/tree-sitter-sml",
-  "rev": "105585ae935d8662ab61ce2f5479c35d2b1e456e",
-  "date": "2024-08-27T08:47:35-04:00",
-  "path": "/nix/store/ry1dy2gixn8b77xrgslvmk9vkgicylrq-tree-sitter-sml",
-  "sha256": "1lfjihsmkb93h6naimppwddh203p4bkv9jj4wy8zr6hjawf35aw6",
-  "hash": "sha256-hqsyHFcSmvyR50TKtOcidwABW+P31qisgSOtWTWM0tE=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json
deleted file mode 100644
index b0e2dea9eacb..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/JoranHonig/tree-sitter-solidity",
-  "rev": "c3da7d989747679305ec1c84b68082f01089d49f",
-  "date": "2024-04-13T15:44:09+02:00",
-  "path": "/nix/store/a9spnmq129v18p2mwh52ksnq8aj5ag0s-tree-sitter-solidity",
-  "sha256": "0ha57nxqina9jl2i1b0r38m971wk0lhxrivgb88yii0r07zdmp84",
-  "hash": "sha256-BN3a/gEZxOgRWm/H3CEFk4eTKhoZrBAFlUnZiLs9RUE=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json
deleted file mode 100644
index b9ad674d5f66..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/bonabeavis/tree-sitter-sparql",
-  "rev": "d853661ca680d8ff7f8d800182d5782b61d0dd58",
-  "date": "2024-06-26T16:15:19+02:00",
-  "path": "/nix/store/cz22k5dh2fqyfmamdx1mrlwv28shnk1x-tree-sitter-sparql",
-  "sha256": "1xd0hp2m62ggka46cv2px0507yyl9d9cdqhlpglq6y1jqb5p85fh",
-  "hash": "sha256-0BV0y8IyeIPpuxTixlJL1PsDCuhXbGaImu8JU8WFoPU=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
deleted file mode 100644
index 10de150ee9a7..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/derekstride/tree-sitter-sql",
-  "rev": "64d6707541898bf17a306033050b1932524e215f",
-  "date": "2025-09-23T13:22:41-04:00",
-  "path": "/nix/store/hgby3annavhkca58d82ixd1i0dgb4a3g-tree-sitter-sql",
-  "sha256": "0qv5pyz7yzy8bnvs8sc1wdp6wgl1wq4imynzwsihjg8yrxkdqbhc",
-  "hash": "sha256-DC7cZs8ePQmj5t/6GgnmgT5ubuOBaaS3Xch/f76/ZWM=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
deleted file mode 100644
index 646b61115996..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/madskjeldgaard/tree-sitter-supercollider",
-  "rev": "76b3cab1773f08bb7d3a185420b0a44c6da8c294",
-  "date": "2025-09-17T20:52:30+02:00",
-  "path": "/nix/store/hmc2f1w3xzdhas9gf0m6yz9bbp6ivpqa-tree-sitter-supercollider",
-  "sha256": "1lb8fbx0hhd6lmhjvszm96hrd802mgq6phj4977ag6qdi15zbfbn",
-  "hash": "sha256-drn1S4gNm6fOSUTCa/CrAqCWoUn16y1hpaZBCPpyaNE=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json
deleted file mode 100644
index 9e8861cc1f7d..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/connorlay/tree-sitter-surface",
-  "rev": "21b7676859c1187645a27ff301f76738af5dfd44",
-  "date": "2021-08-15T10:33:50-07:00",
-  "path": "/nix/store/7i1klj80jbcvwgad7nrbcs7hvn68f125-tree-sitter-surface",
-  "sha256": "122v1d2zb0w2k5h7xqgm1c42rwfrp59dzyb2lly7kxmylyazmshy",
-  "hash": "sha256-Hur6lae+9nk8pWL531K52fEsCAv14X5gmYKD9UULW4g=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json
deleted file mode 100644
index 46825eab17b4..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/Himujjal/tree-sitter-svelte",
-  "rev": "be7f2e7db1fc19f0852265ec60923fc058380739",
-  "date": "2023-04-03T22:59:58+05:30",
-  "path": "/nix/store/lqqls8g9zhiv2v32if429cwycn092zq6-tree-sitter-svelte",
-  "sha256": "1kp91sarydq41zznwxwxdv2i2pflgzhmpfv0iqgq47fma9bcv2wy",
-  "hash": "sha256-novNVlLVHYIfjmC7W+F/1F0RxW6dd27/DwQ3n5UO6c4=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json
deleted file mode 100644
index 826b26d04e41..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/wenkokke/tree-sitter-talon",
-  "rev": "53fd1d6102f692ab3040f90a1fe5023b7342ff23",
-  "date": "2024-06-18T14:14:45+01:00",
-  "path": "/nix/store/bva5mf6j33icgd2rr4067i50gjjzbd10-tree-sitter-talon",
-  "sha256": "1kw7axcqpmjbcsl6h8lsvraqv58k0w76rhxcvqqx7kly4jgz1wrm",
-  "hash": "sha256-NfPwnySeztMx3qzDbA4HE5WNVd6aImioZkvWi1lXh88=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
deleted file mode 100644
index 6ac7d582118c..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/vrischmann/tree-sitter-templ",
-  "rev": "27a1fc62c8dd4c49669e03629491f66449c6c435",
-  "date": "2025-09-14T18:21:44+02:00",
-  "path": "/nix/store/zvhrnj22cjvykp2xpgs3dill5mb2p13x-tree-sitter-templ",
-  "sha256": "1lwvyvvdkyy2anckz284fqkl5w26v6ppdwm8ajfkkdbf1cyls7fs",
-  "hash": "sha256-2h1NPQtutTmdVKjydq/ZRvBCJ3YEiT+ZVcL72fb2m9M=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json
deleted file mode 100644
index 35a64f282e31..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/uncenter/tree-sitter-tera",
-  "rev": "692937d52c8dfd91ce0dde722b9b4febbc9bc712",
-  "date": "2025-07-22T07:31:49-04:00",
-  "path": "/nix/store/yk1s71npnbz0vvfkpl4q6gs26xbcfjh3-tree-sitter-tera",
-  "sha256": "0zqkxiybrqrkj55cnpp5xbpw82c99zr752qb4wk7yj159yp1m5fx",
-  "hash": "sha256-3ZUark8lSH8mJwuLcvJPiQnE7+rlXstKkTPjvHzsE38=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json
deleted file mode 100644
index 624aeb633dd3..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/ambroisie/tree-sitter-tiger",
-  "rev": "4a77b2d7a004587646bddc4e854779044b6db459",
-  "date": "2025-03-13T19:58:23Z",
-  "path": "/nix/store/ps5vkphx7wqlzzj8j02sqi7hcgmbwh1c-tree-sitter-tiger",
-  "sha256": "0d4rwxi6zc8psy2adw8lhmvvk0f1miv6w517aiqq11njfbg4kdwc",
-  "hash": "sha256-jLdJ3nLShoBxVCcUbnaswYG5d4UU8aaE1xexb2LnmTQ=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
deleted file mode 100644
index d37e5a6b9f41..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tlaplus-community/tree-sitter-tlaplus",
-  "rev": "8a8413f1d08e7ee40b347206d26eac4324db9fd9",
-  "date": "2024-10-20T11:46:21-04:00",
-  "path": "/nix/store/j8fx0g50q12kbxa85rkg9pv2m6zmgmxy-tree-sitter-tlaplus",
-  "sha256": "11073rjg9n9hnr88193mmb8ff5xlcv6isgqc0g2fbfbl0y820zlk",
-  "hash": "sha256-k34gkAd0ueXEAww/Hc1mtBfn0Kp1pIBQtjDZ9GQeB4Q=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-todotxt.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-todotxt.json
deleted file mode 100644
index 39541800305f..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-todotxt.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "url": "https://github.com/arnarg/tree-sitter-todotxt",
-  "rev": "3937c5cd105ec4127448651a21aef45f52d19609",
-  "date": "2024-01-15T09:45:57+01:00",
-  "path": "/nix/store/37nxnr79ylm1g1myx2zvhzrymy5z0pw4-tree-sitter-todotxt",
-  "sha256": "0551fdv77bdrxsc04gsi3zrc07si34r4gnhaqjg3h5fwbbkj3q1r",
-  "hash": "sha256-OeAh51rcFTiexAraRzIZUR/A8h9RPwKY7rmtc3ZzoRQ=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json
deleted file mode 100644
index 9e9bc79672da..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-toml",
-  "rev": "342d9be207c2dba869b9967124c679b5e6fd0ebe",
-  "date": "2022-04-21T16:26:30-07:00",
-  "path": "/nix/store/is4vnj1s94455s9msasbn7px7jjfr0ai-tree-sitter-toml",
-  "sha256": "00pigsc947qc2p6g21iki6xy4h497arq53fp2fjgiw50bqmknrsp",
-  "hash": "sha256-V2c7K16g8PikE9eNgrM6iUDiu4kzBvHMFQwfkph+8QI=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json
deleted file mode 100644
index 7076b788e36a..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-tsq",
-  "rev": "49da6de661be6a07cb51018880ebe680324e7b82",
-  "date": "2024-02-24T05:44:09-05:00",
-  "path": "/nix/store/jhz3i20lmr3cfwdxp3h6qad6dw1s7yxi-tree-sitter-tsq",
-  "sha256": "1np9li55b28iyg5msmqzkp7ydd887j2nb2fzx3jmzx3ifb533plr",
-  "hash": "sha256-md4xynJx9F/l6N+JZYU8CLXmz50fV13L8xGJVUqk6do=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json
deleted file mode 100644
index 48be60fc7096..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/bonabeavis/tree-sitter-turtle",
-  "rev": "7f789ea7ef765080f71a298fc96b7c957fa24422",
-  "date": "2024-07-02T13:41:07+02:00",
-  "path": "/nix/store/1rscya6w8m579211nsmhhicc3rgk204h-tree-sitter-turtle",
-  "sha256": "0c3diz97lrnxqkq410s9rlmxddjqgnswyc4spdfny045xgfzp9yg",
-  "hash": "sha256-z6f73euFAG9du5owz7V9WLbWK81Jg0DwxN1metKPbTA=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json
deleted file mode 100644
index 8bfe5d5eeafc..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/kaermorchen/tree-sitter-twig",
-  "rev": "40d17f0eb990215e12531abe29ee7691d7ca99a5",
-  "date": "2024-12-06T17:47:37+03:00",
-  "path": "/nix/store/q05mc4lj16wirwm724m1q39sblb5yq5q-tree-sitter-twig",
-  "sha256": "06a6rfgh9mmzqvs7bp8y92axa4fni4c72s82bdin7j3a0x5mxwi6",
-  "hash": "sha256-JvJeSwdqyGNjWwJpcRiJ1hHVlUge3XX0xr/WBJ/LRhk=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
deleted file mode 100644
index d0a0ed3fcea5..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-typescript",
-  "rev": "f975a621f4e7f532fe322e13c4f79495e0a7b2e7",
-  "date": "2024-11-10T21:32:53-05:00",
-  "path": "/nix/store/1gsbn9dw7bbpq5mrgmw71kif0wjmf71s-tree-sitter-typescript",
-  "sha256": "0rlhhqp9dv6y0iljb4bf90d89f07zkfnsrxjb6rvw985ibwpjkh9",
-  "hash": "sha256-CU55+YoFJb6zWbJnbd38B7iEGkhukSVpBN7sli6GkGY=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json
deleted file mode 100644
index 5ad8f460b6db..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/uben0/tree-sitter-typst",
-  "rev": "13863ddcbaa7b68ee6221cea2e3143415e64aea4",
-  "date": "2024-04-09T11:57:57+02:00",
-  "path": "/nix/store/y02g3bdn5nwqiykfki4fhsxmkp7y9kjm-tree-sitter-typst",
-  "sha256": "198rn8wdcqq51nz6hj1zxk7mplplr2z8vc36z6h1zpjjq925794z",
-  "hash": "sha256-n6RTRMJS3h+g+Wawjb7I9NJbz+w/SGi+DQVj1jiyGaU=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json
deleted file mode 100644
index 1af3e2b44c60..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/shnarazk/tree-sitter-uiua",
-  "rev": "f3fb8b8fe367b00e2ad858a419da3dedc8cbeeeb",
-  "date": "2024-10-26T11:23:32+09:00",
-  "path": "/nix/store/ifvi5012plsbl9lxv416yp4jfjrw854f-tree-sitter-uiua",
-  "sha256": "02fiaqap937d072qq1prvljhp7fdh7mxisxjh99vb20kik9r3yvg",
-  "hash": "sha256-b/uR04wTiLVTgrLr2OuBzZ0LJd35BozFAe2MdBVW0Qk=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
deleted file mode 100644
index e2327dcd4a51..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter/tree-sitter-verilog",
-  "rev": "521b535e41a5acd2c6539a922d4649bbe8275110",
-  "date": "2024-11-10T18:32:24-05:00",
-  "path": "/nix/store/b4ybpz7bv7bsx6kkpgvizhp6rfywn96x-tree-sitter-verilog",
-  "sha256": "1mk8waij5lbj1wbayvqs0cxk003dssdic13h14gd5fi1ckfvflja",
-  "hash": "sha256-SlK33WQhutIeCXAEFpvWbQAwOwMab68WD3LRIqPiaNY=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
deleted file mode 100644
index 28989fd89ea5..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/vigoux/tree-sitter-viml",
-  "rev": "7c317fbade4b40baa7babcd6c9097c157d148e60",
-  "date": "2023-05-05T08:51:55+02:00",
-  "path": "/nix/store/dazqp112dyrxh96yizdm382fsz1rmsdj-tree-sitter-viml",
-  "sha256": "1fsngbgpvq4mg0qfwkpdn4qqi3djg2kv4a8g49yw2i8a3d88yg7x",
-  "hash": "sha256-/TyPUBsKRcF9Ig8psqd4so2IMbHtTu4weJXgfd96Vrs=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json
deleted file mode 100644
index 4241e897b642..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/ikatyang/tree-sitter-vue",
-  "rev": "91fe2754796cd8fba5f229505a23fa08f3546c06",
-  "date": "2021-04-04T11:51:48+08:00",
-  "path": "/nix/store/9bw35fa56xli7r2k3b3bzzlm7vkpxzcy-tree-sitter-vue",
-  "sha256": "0l0kqy9ajm5izqcywd39aavgmc281s8qrhmjkbwl6r8arfj8vsrm",
-  "hash": "sha256-NeuNpMsKZUP5mrLCjJEOSLD6tlJpNO4Z/rFUqZLHE1A=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json
deleted file mode 100644
index e01d33e4fc00..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/szebniok/tree-sitter-wgsl",
-  "rev": "40259f3c77ea856841a4e0c4c807705f3e4a2b65",
-  "date": "2023-01-09T17:32:53+01:00",
-  "path": "/nix/store/v97b952wz1x5np7cp5as603qzj2686yf-tree-sitter-wgsl",
-  "sha256": "0w15rhwafbjjmgbxj9fln9pca2w1wr7h5xwni9rniszlkxqf90my",
-  "hash": "sha256-voLkcJ/062hzipb3Ak/mgQvFbrLUJdnXq1IupzjMJXA=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
deleted file mode 100644
index f0ad17112a21..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/winglang/tree-sitter-wing",
-  "rev": "27b595f5ea1aa45b5f777f194c0bd121a7b0c8e3",
-  "date": "2024-09-03T18:25:03-04:00",
-  "path": "/nix/store/az77v8z742hkqm830lvhgnqi1zpx9v8d-tree-sitter-wing",
-  "sha256": "09h79hvi35riwypskhh97qz8wis2kkz27xj777fg8lldvfh5kgdh",
-  "hash": "sha256-sL1ZoNuNUvTcOUf2I/6cQkeOPj4Jwqmv5zGXETdMByY=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json
deleted file mode 100644
index a0472d268303..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/tree-sitter-grammars/tree-sitter-yaml",
-  "rev": "9632edc32eb86966a482fcb3c9a7f4bb78ae0ddb",
-  "date": "2025-05-22T16:31:05+03:00",
-  "path": "/nix/store/rz2zq4cpjgkcnl9b3y0wckcz91a4b7lz-tree-sitter-yaml",
-  "sha256": "0j03miv56d0sh9cnnrxjxwzwjiypw9pqxpx698f9zjc80mlzyqk7",
-  "hash": "sha256-Z2L/aQWIyZ8cSqbfjm/i10fJP++yZ2tZgho0U3asA0g=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json
deleted file mode 100644
index 82e6259a3fe3..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/hubro/tree-sitter-yang",
-  "rev": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502",
-  "date": "2022-11-21T21:25:21+01:00",
-  "path": "/nix/store/ypd2cggg44l0sx0snvkgjbspkfcyscmf-tree-sitter-yang",
-  "sha256": "1vwcsp20dhccr2ag5s09j3jz9cnlkndb2hdn0h3va7md8ka0lhp8",
-  "hash": "sha256-6EIK1EStHrUHBLZBsZqd1LL05ZAJ6PKUyIzBBsTVjO8=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
deleted file mode 100644
index 52cd35bef573..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "url": "https://github.com/maxxnino/tree-sitter-zig",
-  "rev": "a80a6e9be81b33b182ce6305ae4ea28e29211bd5",
-  "date": "2024-10-13T11:52:27+07:00",
-  "path": "/nix/store/7vjvw01f5f8w2czz7n25pxl85zn3b6ys-tree-sitter-zig",
-  "sha256": "0fdf0hcvss7b2rl6wl2rbh6mm43ghfswygz4qv52fb94dxnl0x53",
-  "hash": "sha256-o3RAbW8kLSfKxuQ/z7WDb5BaDVxZUG5oFutovRkErjk=",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "fetchTags": false,
-  "leaveDotGit": false,
-  "rootDir": ""
-}
diff --git a/pkgs/development/tools/parsing/tree-sitter/mypy.ini b/pkgs/development/tools/parsing/tree-sitter/mypy.ini
deleted file mode 100644
index 3a34ffac26ed..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/mypy.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[mypy]
-disallow_untyped_defs = true
-disallow_subclassing_any = true
-
-no_implicit_optional = true
-
-warn_redundant_casts = true
-warn_unused_ignores = true
-warn_no_return = true
-warn_return_any = true
-warn_unreachable = true
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
deleted file mode 100644
index 91d2de40deda..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ /dev/null
@@ -1,626 +0,0 @@
-{
-  writeShellScript,
-  writeText,
-  writers,
-  nix-prefetch-git,
-  formats,
-  lib,
-  coreutils,
-  curl,
-  xe,
-}:
-
-# Grammar list:
-# https://github.com/tree-sitter/tree-sitter/blob/master/docs/index.md
-
-let
-  # Grammars we want to fetch from the tree-sitter github orga
-  knownTreeSitterOrgGrammarRepos = [
-    "tree-sitter-javascript"
-    "tree-sitter-c"
-    "tree-sitter-json"
-    "tree-sitter-cpp"
-    "tree-sitter-ruby"
-    "tree-sitter-go"
-    "tree-sitter-c-sharp"
-    "tree-sitter-python"
-    "tree-sitter-typescript"
-    "tree-sitter-rust"
-    "tree-sitter-bash"
-    "tree-sitter-php"
-    "tree-sitter-java"
-    "tree-sitter-scala"
-    "tree-sitter-ocaml"
-    "tree-sitter-julia"
-    "tree-sitter-html"
-    "tree-sitter-haskell"
-    "tree-sitter-regex"
-    "tree-sitter-css"
-    "tree-sitter-verilog"
-    "tree-sitter-jsdoc"
-    "tree-sitter-ql"
-    "tree-sitter-ql-dbscheme"
-    "tree-sitter-embedded-template"
-    "tree-sitter-tsq"
-    "tree-sitter-toml"
-  ];
-  knownTreeSitterOrgGrammarReposJson = jsonFile "known-tree-sitter-org-grammar-repos" knownTreeSitterOrgGrammarRepos;
-
-  # repos of the tree-sitter github orga we want to ignore (not grammars)
-  ignoredTreeSitterOrgRepos = [
-    "tree-sitter"
-    "tree-sitter-cli"
-    # this is the haskell language bindings, tree-sitter-haskell is the grammar
-    "haskell-tree-sitter"
-    # this is the ruby language bindings, tree-sitter-ruby is the grammar
-    "ruby-tree-sitter.old"
-    # this is the (unmaintained) rust language bindings, tree-sitter-rust is the grammar
-    "rust-tree-sitter"
-    # this is the nodejs language bindings, tree-sitter-javascript is the grammar
-    "node-tree-sitter"
-    # this is the python language bindings, tree-sitter-python is the grammar
-    "py-tree-sitter"
-    # afl fuzzing for tree sitter
-    "afl-tree-sitter"
-    # this is the kotlin language bindings, tree-sitter-kotlin is the grammar
-    "kotlin-tree-sitter"
-    # this is the go language bindings, tree-sitter-go is the grammar
-    "go-tree-sitter"
-    # this is the java language bindings, tree-sitter-java is the grammar
-    "java-tree-sitter"
-    # archived
-    "highlight-schema"
-    # website
-    "tree-sitter.github.io"
-    # not maintained
-    "tree-sitter-razor"
-    # rust library for constructing arbitrary graph structures from source code
-    "tree-sitter-graph"
-    # abandoned
-    "tree-sitter-swift"
-    # this is the swift language bindings, tree-sitter-swift is the (abandoned) grammar
-    "swift-tree-sitter"
-    # abandoned
-    "tree-sitter-agda"
-    # abandoned
-    "tree-sitter-fluent"
-    # to unblock my update
-    "csharp-tree-sitter"
-    # (experimental) java bindings to the Tree-sitter parsing library
-    "java-tree-sitter"
-    # go bindings to the Tree-sitter parsing library
-    "go-tree-sitter"
-    # kotlin bindings to the Tree-sitter parsing library
-    "kotlin-tree-sitter"
-    # not ready to be used
-    "zig-tree-sitter"
-
-    # Non-grammar repositories
-    ".github"
-    "fuzz-action"
-    "parse-action"
-    "parser-setup-action"
-    "parser-test-action"
-    "parser-update-action"
-    "setup-action"
-    "workflows"
-  ];
-  ignoredTreeSitterOrgReposJson = jsonFile "ignored-tree-sitter-org-repos" ignoredTreeSitterOrgRepos;
-
-  # Additional grammars that are not in the official github orga.
-  # If you need a grammar that already exists in the official orga,
-  # make sure to give it a different name.
-  otherGrammars = {
-    "tree-sitter-bitbake" = {
-      orga = "amaanq";
-      repo = "tree-sitter-bitbake";
-    };
-    "tree-sitter-beancount" = {
-      orga = "polarmutex";
-      repo = "tree-sitter-beancount";
-    };
-    "tree-sitter-bqn" = {
-      orga = "shnarazk";
-      repo = "tree-sitter-bqn";
-    };
-    "tree-sitter-clojure" = {
-      orga = "sogaiu";
-      repo = "tree-sitter-clojure";
-    };
-    "tree-sitter-comment" = {
-      orga = "stsewd";
-      repo = "tree-sitter-comment";
-    };
-    "tree-sitter-dart" = {
-      orga = "usernobody14";
-      repo = "tree-sitter-dart";
-    };
-    "tree-sitter-elisp" = {
-      orga = "wilfred";
-      repo = "tree-sitter-elisp";
-    };
-    "tree-sitter-just" = {
-      orga = "IndianBoy42";
-      repo = "tree-sitter-just";
-    };
-    "tree-sitter-nix" = {
-      orga = "nix-community";
-      repo = "tree-sitter-nix";
-    };
-    "tree-sitter-latex" = {
-      orga = "latex-lsp";
-      repo = "tree-sitter-latex";
-    };
-    "tree-sitter-lua" = {
-      orga = "MunifTanjim";
-      repo = "tree-sitter-lua";
-    };
-    "tree-sitter-factor" = {
-      orga = "erochest";
-      repo = "tree-sitter-factor";
-    };
-    "tree-sitter-fennel" = {
-      orga = "travonted";
-      repo = "tree-sitter-fennel";
-    };
-    "tree-sitter-make" = {
-      orga = "alemuller";
-      repo = "tree-sitter-make";
-    };
-    "tree-sitter-markdown" = {
-      orga = "MDeiml";
-      repo = "tree-sitter-markdown";
-    };
-    "tree-sitter-proto" = {
-      orga = "mitchellh";
-      repo = "tree-sitter-proto";
-    };
-    "tree-sitter-rego" = {
-      orga = "FallenAngel97";
-      repo = "tree-sitter-rego";
-    };
-    "tree-sitter-rst" = {
-      orga = "stsewd";
-      repo = "tree-sitter-rst";
-    };
-    "tree-sitter-sml" = {
-      orga = "MatthewFluet";
-      repo = "tree-sitter-sml";
-    };
-    "tree-sitter-svelte" = {
-      orga = "Himujjal";
-      repo = "tree-sitter-svelte";
-    };
-    "tree-sitter-sql" = {
-      orga = "derekstride";
-      repo = "tree-sitter-sql";
-      branch = "gh-pages";
-    };
-    "tree-sitter-talon" = {
-      orga = "wenkokke";
-      repo = "tree-sitter-talon";
-    };
-    "tree-sitter-typst" = {
-      orga = "uben0";
-      repo = "tree-sitter-typst";
-    };
-    "tree-sitter-vim" = {
-      orga = "vigoux";
-      repo = "tree-sitter-viml";
-    };
-    "tree-sitter-yaml" = {
-      orga = "tree-sitter-grammars";
-      repo = "tree-sitter-yaml";
-    };
-    "tree-sitter-zig" = {
-      orga = "maxxnino";
-      repo = "tree-sitter-zig";
-    };
-    "tree-sitter-fish" = {
-      orga = "ram02z";
-      repo = "tree-sitter-fish";
-    };
-    "tree-sitter-dot" = {
-      orga = "rydesun";
-      repo = "tree-sitter-dot";
-    };
-    "tree-sitter-norg" = {
-      orga = "nvim-neorg";
-      repo = "tree-sitter-norg";
-    };
-    "tree-sitter-norg-meta" = {
-      orga = "nvim-neorg";
-      repo = "tree-sitter-norg-meta";
-    };
-    "tree-sitter-commonlisp" = {
-      orga = "thehamsta";
-      repo = "tree-sitter-commonlisp";
-    };
-    "tree-sitter-cuda" = {
-      orga = "thehamsta";
-      repo = "tree-sitter-cuda";
-    };
-    "tree-sitter-glsl" = {
-      orga = "thehamsta";
-      repo = "tree-sitter-glsl";
-    };
-    "tree-sitter-dockerfile" = {
-      orga = "camdencheek";
-      repo = "tree-sitter-dockerfile";
-    };
-    "tree-sitter-ledger" = {
-      orga = "cbarrete";
-      repo = "tree-sitter-ledger";
-    };
-    "tree-sitter-gomod" = {
-      orga = "camdencheek";
-      repo = "tree-sitter-go-mod";
-    };
-    "tree-sitter-gowork" = {
-      orga = "omertuc";
-      repo = "tree-sitter-go-work";
-    };
-    "tree-sitter-graphql" = {
-      orga = "bkegley";
-      repo = "tree-sitter-graphql";
-    };
-    "tree-sitter-pgn" = {
-      orga = "rolandwalker";
-      repo = "tree-sitter-pgn";
-    };
-    "tree-sitter-perl" = {
-      orga = "ganezdragon";
-      repo = "tree-sitter-perl";
-    };
-    "tree-sitter-kotlin" = {
-      orga = "fwcd";
-      repo = "tree-sitter-kotlin";
-    };
-    "tree-sitter-scss" = {
-      orga = "serenadeai";
-      repo = "tree-sitter-scss";
-    };
-    "tree-sitter-erlang" = {
-      orga = "WhatsApp";
-      repo = "tree-sitter-erlang";
-    };
-    "tree-sitter-elixir" = {
-      orga = "elixir-lang";
-      repo = "tree-sitter-elixir";
-    };
-    "tree-sitter-surface" = {
-      orga = "connorlay";
-      repo = "tree-sitter-surface";
-    };
-    "tree-sitter-eex" = {
-      orga = "connorlay";
-      repo = "tree-sitter-eex";
-    };
-    "tree-sitter-heex" = {
-      orga = "connorlay";
-      repo = "tree-sitter-heex";
-    };
-    "tree-sitter-supercollider" = {
-      orga = "madskjeldgaard";
-      repo = "tree-sitter-supercollider";
-    };
-    "tree-sitter-tlaplus" = {
-      orga = "tlaplus-community";
-      repo = "tree-sitter-tlaplus";
-    };
-    "tree-sitter-glimmer" = {
-      orga = "alexlafroscia";
-      repo = "tree-sitter-glimmer";
-    };
-    "tree-sitter-pug" = {
-      orga = "zealot128";
-      repo = "tree-sitter-pug";
-    };
-    "tree-sitter-vue" = {
-      orga = "ikatyang";
-      repo = "tree-sitter-vue";
-    };
-    "tree-sitter-elm" = {
-      orga = "elm-tooling";
-      repo = "tree-sitter-elm";
-    };
-    "tree-sitter-yang" = {
-      orga = "hubro";
-      repo = "tree-sitter-yang";
-    };
-    "tree-sitter-query" = {
-      orga = "nvim-treesitter";
-      repo = "tree-sitter-query";
-    };
-    "tree-sitter-sparql" = {
-      orga = "bonabeavis";
-      repo = "tree-sitter-sparql";
-    };
-    "tree-sitter-gdscript" = {
-      orga = "prestonknopp";
-      repo = "tree-sitter-gdscript";
-    };
-    "tree-sitter-gemini" = {
-      orga = "blessanabraham";
-      repo = "tree-sitter-gemini";
-    };
-    "tree-sitter-go-template" = {
-      orga = "ngalaiko";
-      repo = "tree-sitter-go-template";
-    };
-    "tree-sitter-godot-resource" = {
-      orga = "prestonknopp";
-      repo = "tree-sitter-godot-resource";
-    };
-    "tree-sitter-turtle" = {
-      orga = "bonabeavis";
-      repo = "tree-sitter-turtle";
-    };
-    "tree-sitter-devicetree" = {
-      orga = "joelspadin";
-      repo = "tree-sitter-devicetree";
-    };
-    "tree-sitter-r" = {
-      orga = "r-lib";
-      repo = "tree-sitter-r";
-    };
-    "tree-sitter-bibtex" = {
-      orga = "latex-lsp";
-      repo = "tree-sitter-bibtex";
-    };
-    "tree-sitter-fortran" = {
-      orga = "stadelmanma";
-      repo = "tree-sitter-fortran";
-    };
-    "tree-sitter-cmake" = {
-      orga = "uyha";
-      repo = "tree-sitter-cmake";
-    };
-    "tree-sitter-janet-simple" = {
-      orga = "sogaiu";
-      repo = "tree-sitter-janet-simple";
-    };
-    "tree-sitter-json5" = {
-      orga = "joakker";
-      repo = "tree-sitter-json5";
-    };
-    "tree-sitter-pioasm" = {
-      orga = "leo60228";
-      repo = "tree-sitter-pioasm";
-    };
-    "tree-sitter-hjson" = {
-      orga = "winston0410";
-      repo = "tree-sitter-hjson";
-    };
-    "tree-sitter-llvm" = {
-      orga = "benwilliamgraham";
-      repo = "tree-sitter-llvm";
-    };
-    "tree-sitter-http" = {
-      orga = "ntbbloodbath";
-      repo = "tree-sitter-http";
-    };
-    "tree-sitter-prisma" = {
-      orga = "victorhqc";
-      repo = "tree-sitter-prisma";
-    };
-    "tree-sitter-org-nvim" = {
-      orga = "milisims";
-      repo = "tree-sitter-org";
-    };
-    "tree-sitter-hcl" = {
-      orga = "MichaHoffmann";
-      repo = "tree-sitter-hcl";
-    };
-    "tree-sitter-scheme" = {
-      orga = "6cdh";
-      repo = "tree-sitter-scheme";
-    };
-    "tree-sitter-tiger" = {
-      orga = "ambroisie";
-      repo = "tree-sitter-tiger";
-    };
-    "tree-sitter-nickel" = {
-      orga = "nickel-lang";
-      repo = "tree-sitter-nickel";
-    };
-    "tree-sitter-smithy" = {
-      orga = "indoorvivants";
-      repo = "tree-sitter-smithy";
-    };
-    "tree-sitter-jsonnet" = {
-      orga = "sourcegraph";
-      repo = "tree-sitter-jsonnet";
-    };
-    "tree-sitter-solidity" = {
-      orga = "JoranHonig";
-      repo = "tree-sitter-solidity";
-    };
-    "tree-sitter-nu" = {
-      orga = "nushell";
-      repo = "tree-sitter-nu";
-    };
-    "tree-sitter-cue" = {
-      orga = "eonpatapon";
-      repo = "tree-sitter-cue";
-    };
-    "tree-sitter-uiua" = {
-      orga = "shnarazk";
-      repo = "tree-sitter-uiua";
-    };
-    "tree-sitter-wing" = {
-      orga = "winglang";
-      repo = "tree-sitter-wing";
-    };
-    "tree-sitter-wgsl" = {
-      orga = "szebniok";
-      repo = "tree-sitter-wgsl";
-    };
-    "tree-sitter-templ" = {
-      orga = "vrischmann";
-      repo = "tree-sitter-templ";
-    };
-    "tree-sitter-gleam" = {
-      orga = "gleam-lang";
-      repo = "tree-sitter-gleam";
-    };
-    "tree-sitter-koka" = {
-      orga = "mtoohey31";
-      repo = "tree-sitter-koka";
-    };
-    "tree-sitter-earthfile" = {
-      orga = "glehmann";
-      repo = "tree-sitter-earthfile";
-    };
-    "tree-sitter-river" = {
-      orga = "grafana";
-      repo = "tree-sitter-river";
-    };
-    "tree-sitter-twig" = {
-      orga = "kaermorchen";
-      repo = "tree-sitter-twig";
-    };
-    "tree-sitter-hyprlang" = {
-      orga = "tree-sitter-grammars";
-      repo = "tree-sitter-hyprlang";
-    };
-    "tree-sitter-kdl" = {
-      orga = "tree-sitter-grammars";
-      repo = "tree-sitter-kdl";
-    };
-    "tree-sitter-tera" = {
-      orga = "uncenter";
-      repo = "tree-sitter-tera";
-    };
-    "tree-sitter-netlinx" = {
-      orga = "norgate-av";
-      repo = "tree-sitter-netlinx";
-    };
-    "tree-sitter-crystal" = {
-      orga = "crystal-lang-tools";
-      repo = "tree-sitter-crystal";
-    };
-    "tree-sitter-slint" = {
-      orga = "slint-ui";
-      repo = "tree-sitter-slint";
-    };
-  };
-
-  pinnedGrammars = [
-    "tree-sitter-bash"
-    "tree-sitter-bibtex"
-    "tree-sitter-c"
-    "tree-sitter-comment"
-    "tree-sitter-fortran"
-    "tree-sitter-hcl"
-    "tree-sitter-hyprlang"
-    "tree-sitter-llvm"
-    "tree-sitter-markdown"
-    "tree-sitter-query"
-    "tree-sitter-rust"
-  ];
-  pinnedGrammarsJson = jsonFile pinnedGrammars;
-
-  allGrammars =
-    let
-      treeSitterOrgaGrammars = lib.listToAttrs (
-        map (repo: {
-          name = repo;
-          value = {
-            orga = "tree-sitter";
-            inherit repo;
-          };
-        }) knownTreeSitterOrgGrammarRepos
-      );
-
-    in
-    lib.attrsets.unionOfDisjoint otherGrammars treeSitterOrgaGrammars;
-
-  jsonFile = name: val: (formats.json { }).generate name val;
-
-  # implementation of the updater
-  updateImpl =
-    passArgs "updateImpl-with-args"
-      {
-        binaries = {
-          curl = "${curl}/bin/curl";
-          nix-prefetch-git = "${nix-prefetch-git}/bin/nix-prefetch-git";
-          printf = "${coreutils}/bin/printf";
-        };
-        inherit
-          knownTreeSitterOrgGrammarRepos
-          ignoredTreeSitterOrgRepos
-          pinnedGrammars
-          ;
-      }
-      (
-        writers.writePython3 "updateImpl" {
-          flakeIgnore = [ "E501" ];
-        } ./update_impl.py
-      );
-
-  # Pass the given arguments to the command, in the ARGS environment variable.
-  # The arguments are just a json object that should be available in the script.
-  passArgs =
-    name: argAttrs: script:
-    writeShellScript name ''
-      env ARGS="$(< ${jsonFile "${name}-args" argAttrs})" \
-        ${script} "$@"
-    '';
-
-  foreachSh =
-    attrs: f: lib.concatMapStringsSep "\n" f (lib.mapAttrsToList (k: v: { name = k; } // v) attrs);
-
-  jsonNewlines = lib.concatMapStringsSep "\n" (lib.generators.toJSON { });
-
-  # Run the given script for each of the attr list.
-  # The attrs are passed to the script as a json value.
-  forEachParallel =
-    name: script: listOfAttrs:
-    writeShellScript "for-each-parallel.sh" ''
-      < ${writeText "${name}.json" (jsonNewlines listOfAttrs)} \
-        ${xe}/bin/xe -F -j5 ${script} {}
-    '';
-
-  # The output directory in the current source tree.
-  # This will depend on your local environment, but that is intentional.
-  outputDir = "${toString ./.}/grammars";
-
-  update-all-grammars = writeShellScript "update-all-grammars.sh" ''
-     set -euo pipefail
-    ${updateImpl} fetch-and-check-tree-sitter-repos '{}'
-     echo "writing files to ${outputDir}" 1>&2
-     mkdir -p "${outputDir}"
-     ${forEachParallel "repos-to-fetch"
-       (writeShellScript "fetch-repo" ''
-         ${updateImpl} fetch-repo "$1"
-       '')
-       (
-         lib.mapAttrsToList (
-           nixRepoAttrName: attrs:
-           attrs
-           // {
-             inherit
-               nixRepoAttrName
-               outputDir
-               ;
-           }
-         ) allGrammars
-       )
-     }
-     ${updateImpl} print-all-grammars-nix-file "$(< ${
-       jsonFile "all-grammars.json" {
-         allGrammars = lib.mapAttrsToList (
-           nixRepoAttrName: attrs:
-           attrs
-           // {
-             inherit nixRepoAttrName;
-           }
-         ) allGrammars;
-         inherit outputDir;
-       }
-     })"
-  '';
-
-in
-update-all-grammars
diff --git a/pkgs/development/tools/parsing/tree-sitter/update_impl.py b/pkgs/development/tools/parsing/tree-sitter/update_impl.py
deleted file mode 100644
index 3133aa3902af..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/update_impl.py
+++ /dev/null
@@ -1,226 +0,0 @@
-from urllib.parse import quote
-import json
-import subprocess as sub
-import os
-import sys
-from typing import Iterator, Any, Literal, TypedDict, Optional
-from tempfile import NamedTemporaryFile
-
-debug: bool = True if os.environ.get("DEBUG", False) else False
-Bin = str
-args: dict[str, Any] = json.loads(os.environ["ARGS"])
-bins: dict[str, Bin] = args["binaries"]
-
-mode: str = sys.argv[1]
-jsonArg: dict = json.loads(sys.argv[2])
-
-Args = Iterator[str]
-
-
-def log(msg: str) -> None:
-    print(msg, file=sys.stderr)
-
-
-def atomically_write(file_path: str, content: bytes) -> None:
-    """atomically write the content into `file_path`"""
-    with NamedTemporaryFile(
-        # write to the parent dir, so that it’s guaranteed to be on the same filesystem
-        dir=os.path.dirname(file_path),
-        delete=False
-    ) as tmp:
-        try:
-            tmp.write(content)
-            os.rename(
-                src=tmp.name,
-                dst=file_path
-            )
-        except Exception:
-            os.unlink(tmp.name)
-
-
-def curl_github_args(token: str | None, url: str) -> Args:
-    """Query the github API via curl"""
-    yield bins["curl"]
-    if not debug:
-        yield "--silent"
-    # follow redirects
-    yield "--location"
-    if token:
-        yield "-H"
-        yield f"Authorization: token {token}"
-    yield url
-
-
-def curl_result(output: bytes) -> Any | Literal["not found"]:
-    """Parse the curl result of the github API"""
-    res: Any = json.loads(output)
-    match res:
-        case dict(res):
-            message: str = res.get("message", "")
-            if "rate limit" in message:
-                sys.exit("Rate limited by the Github API")
-            if "Not Found" in message:
-                return "not found"
-    # if the result is another type, we can pass it on
-    return res
-
-
-def nix_prefetch_git_args(url: str, version_rev: str) -> Args:
-    """Prefetch a git repository"""
-    yield bins["nix-prefetch-git"]
-    if not debug:
-        yield "--quiet"
-    yield "--no-deepClone"
-    yield "--url"
-    yield url
-    yield "--rev"
-    yield version_rev
-
-
-def run_cmd(args: Args) -> bytes:
-    all = list(args)
-    if debug:
-        log(str(all))
-    return sub.check_output(all)
-
-
-Dir = str
-
-
-def fetchRepo() -> None:
-    """fetch the given repo and write its nix-prefetch output to the corresponding grammar json file"""
-    match jsonArg:
-        case {
-            "orga": orga,
-            "repo": repo,
-            "outputDir": outputDir,
-            "nixRepoAttrName": nixRepoAttrName,
-        }:
-            if repo in args["pinnedGrammars"]:
-                log(f"Grammar {repo} is pinned, skipping upgrade...")
-                return
-
-            token: str | None = os.environ.get("GITHUB_TOKEN", None)
-            out = run_cmd(
-                curl_github_args(
-                    token,
-                    url=f"https://api.github.com/repos/{quote(orga)}/{quote(repo)}/releases/latest"
-                )
-            )
-            release: str
-            match curl_result(out):
-                case "not found":
-                    if "branch" in jsonArg:
-                        branch = jsonArg.get("branch")
-                        release = f"refs/heads/{branch}"
-                    else:
-                        # github sometimes returns an empty list even tough there are releases
-                        log(f"uh-oh, latest for {orga}/{repo} is not there, using HEAD")
-                        release = "HEAD"
-                case {"tag_name": tag_name}:
-                    release = tag_name
-                case _:
-                    sys.exit(f"git result for {orga}/{repo} did not have a `tag_name` field")
-
-            log(f"Fetching latest release ({release}) of {orga}/{repo} …")
-            res = run_cmd(
-                nix_prefetch_git_args(
-                    url=f"https://github.com/{quote(orga)}/{quote(repo)}",
-                    version_rev=release
-                )
-            )
-            atomically_write(
-                file_path=os.path.join(
-                    outputDir,
-                    f"{nixRepoAttrName}.json"
-                ),
-                content=res
-            )
-        case _:
-            sys.exit("input json must have `orga` and `repo` keys")
-
-
-def fetchOrgaLatestRepos(orga: str) -> set[str]:
-    """fetch the latest (100) repos from the given github organization"""
-    token: str | None = os.environ.get("GITHUB_TOKEN", None)
-    out = run_cmd(
-        curl_github_args(
-            token,
-            url=f"https://api.github.com/orgs/{quote(orga)}/repos?per_page=100"
-        )
-    )
-    match curl_result(out):
-        case "not found":
-            sys.exit(f"github organization {orga} not found")
-        case list(repos):
-            res: list[str] = []
-            for repo in repos:
-                name = repo.get("name")
-                if name:
-                    res.append(name)
-            return set(res)
-        case _:
-            sys.exit("github result was not a list of repos, but {other}")
-
-
-def checkTreeSitterRepos(latest_github_repos: set[str]) -> None:
-    """Make sure we know about all tree sitter repos on the tree sitter orga."""
-    known: set[str] = set(args["knownTreeSitterOrgGrammarRepos"])
-    ignored: set[str] = set(args["ignoredTreeSitterOrgRepos"])
-
-    unknown = latest_github_repos - (known | ignored)
-
-    if unknown:
-        sys.exit(f"These repositories are neither known nor ignored:\n{unknown}")
-
-
-Grammar = TypedDict(
-    "Grammar",
-    {
-        "nixRepoAttrName": str,
-        "orga": str,
-        "repo": str,
-        "branch": Optional[str]
-    }
-)
-
-
-def printAllGrammarsNixFile() -> None:
-    """Print a .nix file that imports all grammars."""
-    allGrammars: list[dict[str, Grammar]] = jsonArg["allGrammars"]
-    outputDir: Dir = jsonArg["outputDir"]
-
-    def file() -> Iterator[str]:
-        yield "{ lib }:"
-        yield "{"
-        for grammar in allGrammars:
-            n = grammar["nixRepoAttrName"]
-            yield f"  {n} = lib.importJSON ./{n}.json;"
-        yield "}"
-        yield ""
-
-    atomically_write(
-        file_path=os.path.join(
-            outputDir,
-            "default.nix"
-        ),
-        content="\n".join(file()).encode()
-    )
-
-
-def fetchAndCheckTreeSitterRepos() -> None:
-    log("fetching list of grammars")
-    latest_repos = fetchOrgaLatestRepos(orga="tree-sitter")
-    log("checking the tree-sitter repo list against the grammars we know")
-    checkTreeSitterRepos(latest_repos)
-
-
-match mode:
-    case "fetch-repo":
-        fetchRepo()
-    case "fetch-and-check-tree-sitter-repos":
-        fetchAndCheckTreeSitterRepos()
-    case "print-all-grammars-nix-file":
-        printAllGrammarsNixFile()
-    case _:
-        sys.exit(f"mode {mode} unknown")
diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix
index 2385a2d79967..4a2068abc0eb 100644
--- a/pkgs/development/web/nodejs/v24.nix
+++ b/pkgs/development/web/nodejs/v24.nix
@@ -25,8 +25,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "24.11.1";
-  sha256 = "ea4da35f1c9ca376ec6837e1e30cee30d491847fe152a3f0378dc1156d954bbd";
+  version = "24.12.0";
+  sha256 = "6d3e891a016b90f6c6a19ea5cbc9c90c57eef9198670ba93f04fa82af02574ae";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
diff --git a/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix b/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix
index 6af600c3c13e..91a9be4dde7b 100644
--- a/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "samoswall";
   domain = "polaris";
-  version = "1.0.12";
+  version = "1.0.13";
 
   src = fetchFromGitHub {
     owner = "samoswall";
     repo = "polaris-mqtt";
     tag = "v${version}";
-    hash = "sha256-LH5as1HaD+fgj2ZJ8su7Jz1lE+Dh0iJHZilOUoiy7jo=";
+    hash = "sha256-SpnrEW/gzUMZXlnoyzOC4/8ooIxUqrcRNIAdBzUR4oY=";
   };
 
   meta = {
diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix
index 9a478cbc399f..178e818049ad 100644
--- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "victoriametrics-logs-datasource";
-  version = "0.22.3";
-  zipHash = "sha256-j4cH6b3nZcl9rWrUXBox/EaEm8V7KHXvFAOMRw+9fzU=";
+  version = "0.22.4";
+  zipHash = "sha256-xDq8p86N2tgzFaNoE5/r4hgFc560bVl7VWGGL2teHuA=";
   meta = {
     description = "Grafana datasource for VictoriaLogs";
     license = lib.licenses.asl20;
diff --git a/pkgs/tools/inputmethods/input-remapper/default.nix b/pkgs/tools/inputmethods/input-remapper/default.nix
index 49a41fd31d8f..719953dc2c7e 100644
--- a/pkgs/tools/inputmethods/input-remapper/default.nix
+++ b/pkgs/tools/inputmethods/input-remapper/default.nix
@@ -38,14 +38,14 @@ let
 in
 (buildPythonApplication rec {
   pname = "input-remapper";
-  version = "2.1.1";
+  version = "2.2.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "sezanzeb";
     repo = "input-remapper";
     tag = version;
-    hash = "sha256-GMKcs2UK1yegGT/TBsLGgTBJROQ38M6WwnLbJIuAZwg=";
+    hash = "sha256-MZO40Y8ym/lwHB8PETdtByAJb/UMMM6pRAAgAYao8UI=";
   };
 
   postPatch = ''
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f370a755de55..6a29a1e02b88 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1402,6 +1402,7 @@ mapAliases {
   redpanda = throw "'redpanda' has been renamed to/replaced by 'redpanda-client'"; # Converted to throw 2025-10-27
   redshift-plasma-applet = throw "'redshift-plasma-applet' has been removed as it is obsolete and lacks maintenance upstream."; # Added 2025-11-09
   remotebox = throw "remotebox has been removed because it was unmaintained and broken for a long time"; # Added 2025-09-11
+  resp-app = throw "'resp-app' has been replaced by 'redisinsight'"; # Added 2025-12-17
   responsively-app = throw "'responsively-app' has been removed due to lack of maintenance upstream."; # Added 2025-06-25
   retroarchBare = throw "'retroarchBare' has been renamed to/replaced by 'retroarch-bare'"; # Converted to throw 2025-10-27
   retroarchFull = throw "'retroarchFull' has been renamed to/replaced by 'retroarch-full'"; # Converted to throw 2025-10-27
@@ -1449,7 +1450,6 @@ mapAliases {
   sequoia = throw "'sequoia' has been renamed to/replaced by 'sequoia-sq'"; # Converted to throw 2025-10-27
   serverless = throw "'serverless' has been removed because version 3.x is unmaintained upstream and vulnerable, and version 4.x lacks a suitable binary or source download."; # Added 2025-11-22
   session-desktop-appimage = throw "'session-desktop-appimage' has been renamed to/replaced by 'session-desktop'"; # Converted to throw 2025-10-27
-  setserial = throw "'setserial' has been removed as it had been abandoned upstream"; # Added 2025-05-18
   sexp = throw "'sexp' has been renamed to/replaced by 'sexpp'"; # Converted to throw 2025-10-27
   shadered = throw "shadered has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   shared_desktop_ontologies = throw "'shared_desktop_ontologies' has been removed as it had been abandoned upstream"; # Added 2025-11-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70cba1140dc2..5d751f8a13b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10948,7 +10948,7 @@ with pkgs;
 
   hpack = haskell.lib.compose.justStaticExecutables haskellPackages.hpack;
 
-  hugin = callPackage ../applications/graphics/hugin {
+  hugin = callPackage ../by-name/hu/hugin/package.nix {
     wxGTK = wxGTK32;
   };
 
@@ -13871,8 +13871,6 @@ with pkgs;
     }
   );
 
-  resp-app = libsForQt5.callPackage ../applications/misc/resp-app { };
-
   pgadmin4-desktopmode = pgadmin4.override { server-mode = false; };
 
   philipstv = with python3Packages; toPythonApplication philipstv;
@@ -14173,10 +14171,6 @@ with pkgs;
     libsoup = libsoup_3;
   };
 
-  davis = callPackage ../by-name/da/davis/package.nix {
-    php = php83; # https://github.com/tchapi/davis/issues/195
-  };
-
   gpac-unstable = callPackage ../by-name/gp/gpac/package.nix {
     releaseChannel = "unstable";
   };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 6b9f2d3d2532..c8be542a68f5 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -405,6 +405,7 @@ mapAliases {
   qiskit-ibmq-provider = throw "qiskit-imbq-provider has been removed, since it was deprecated upstream"; # added 2025-09-13
   qiskit-ignis = throw "qiskit-ignis has been removed, since it was deprecated upstream"; # added 2025-09-13
   qiskit-terra = throw "qiskit-terra has been removed, since it was deprecated upstream."; # added 2025-09-13
+  qnap-qsw = throw "'qnap-qsw' has been replaced by 'aioqsw'"; # added 2025-12-17
   Quandl = throw "'Quandl' has been renamed to/replaced by 'quandl'"; # Converted to throw 2025-10-29
   querystring_parser = throw "'querystring_parser' has been renamed to/replaced by 'querystring-parser'"; # Converted to throw 2025-10-29
   radian = throw "radian has been promoted to a top-level attribute name: `pkgs.radian`"; # added 2025-05-02
@@ -479,6 +480,7 @@ mapAliases {
   tikzplotlib = throw "tikzplotlib was removed because it is incompatible with recent versions of matplotlib and webcolors"; # added 2025-11-11
   torchtnt-nightly = throw "'torchtnt-nightly' was only needed as a test dependency for 'torcheval', but these tests are no longer run"; # added 2025-11-12
   torrent_parser = throw "'torrent_parser' has been renamed to/replaced by 'torrent-parser'"; # Converted to throw 2025-10-29
+  tracing = throw "'tracing' has been removed because its source code has been removed"; # Added 2025-12-17
   treeo = throw "treeo has been removed because it has been marked as broken since 2023."; # Added 2025-10-11
   treex = throw "treex has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11
   trezor_agent = throw "'trezor_agent' has been renamed to/replaced by 'trezor-agent'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e45622952ab8..22f8feba5c7c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5105,6 +5105,10 @@ self: super: with self; {
 
   extension-helpers = callPackage ../development/python-modules/extension-helpers { };
 
+  extra-streamlit-components =
+    callPackage ../development/python-modules/extra-streamlit-components
+      { };
+
   extract-msg = callPackage ../development/python-modules/extract-msg { };
 
   extractcode = callPackage ../development/python-modules/extractcode { };
@@ -15939,8 +15943,6 @@ self: super: with self; {
 
   qiskit-optimization = callPackage ../development/python-modules/qiskit-optimization { };
 
-  qnap-qsw = callPackage ../development/python-modules/qnap-qsw { };
-
   qnapstats = callPackage ../development/python-modules/qnapstats { };
 
   qpageview = callPackage ../development/python-modules/qpageview { };
@@ -18176,6 +18178,12 @@ self: super: with self; {
 
   streamlit = callPackage ../development/python-modules/streamlit { };
 
+  streamlit-avatar = callPackage ../development/python-modules/streamlit-avatar { };
+
+  streamlit-folium = callPackage ../development/python-modules/streamlit-folium { };
+
+  streamlit-notify = callPackage ../development/python-modules/streamlit-notify { };
+
   streamz = callPackage ../development/python-modules/streamz { };
 
   strenum = callPackage ../development/python-modules/strenum { };
@@ -19073,8 +19081,6 @@ self: super: with self; {
 
   tracerite = callPackage ../development/python-modules/tracerite { };
 
-  tracing = callPackage ../development/python-modules/tracing { };
-
   trackpy = callPackage ../development/python-modules/trackpy { };
 
   trafilatura = callPackage ../development/python-modules/trafilatura { };