Merge master into staging-next

2025-12-31 00:18:51 +00:00
parent bd0c1fd75d 6e600478a7
commit a1197113bb
69 changed files with 5301 additions and 4154 deletions
@@ -68,6 +68,8 @@

 - All Xfce packages have been moved to top level (e.g. if you previously added `pkgs.xfce.xfce4-whiskermenu-plugin` to `environment.systemPackages`, you will need to change it to `pkgs.xfce4-whiskermenu-plugin`). The `xfce` scope will be removed in NixOS 26.11.

+- `vimPlugins.nvim-treesitter` has been updated to `main` branch, which is a full and incompatible rewrite. If you can't or don't want to update, you should use `vimPlugins.nvim-treesitter-legacy`.
+
 ## Other Notable Changes {#sec-nixpkgs-release-26.05-notable-changes}

 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@@ -22281,6 +22281,11 @@
    githubId = 395821;
    name = "rht";
  };
+  rhydianjenkins = {
+    name = "Rhydian Jenkins";
+    github = "RhydianJenkins";
+    githubId = 9198690;
+  };
  rhysmdnz = {
    email = "rhys@memes.nz";
    matrix = "@rhys:memes.nz";
@@ -96,16 +96,27 @@ let

        # Note: secrets are stored outside /etc/ and /nix/store to
        # test for accessibility of these paths
-        system.activationScripts.wpa-secrets = {
-          deps = [
-            "users"
-            "specialfs"
+        systemd.services.wpa-secrets = {
+          wantedBy = [
+            "network.target"
+            "multi-user.target"
          ];
-          text = ''
-            install -Dm600 -o wpa_supplicant ${pkgs.writeText "wpa" ''
-              psk_nixos_test=${naughtyPassphrase}
-            ''} /var/lib/secrets/wpa
-          '';
+          before = [
+            "network.target"
+            "multi-user.target"
+          ];
+          serviceConfig = {
+            Type = "oneshot";
+          };
+          script =
+            let
+              secretFile = pkgs.writeText "wpa" ''
+                psk_nixos_test=${naughtyPassphrase}
+              '';
+            in
+            ''
+              install -Dm600 -o wpa_supplicant ${secretFile} /var/lib/secrets/wpa
+            '';
        };

        # wireless client
@@ -9,38 +9,38 @@
    },
    "clion": {
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "91474a3c35a9b3d50f43f0549098317b65aa881f2f80c3345f8dee7587d31f9e",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.5.tar.gz",
-      "build_number": "252.28238.22"
+      "version": "2025.3.1",
+      "sha256": "44ae3da5358ba010a62d55ab412b72f364c5dcd2c2dcd2004ae34b7463807bbd",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.3.1.tar.gz",
+      "build_number": "253.29346.141"
    },
    "datagrip": {
      "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
-      "version": "2025.3",
-      "sha256": "010ad3a676cfe984e7498d1eb4f84686d7a110acbde4f9d288f53967255340e6",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3.tar.gz",
-      "build_number": "253.28294.259"
+      "version": "2025.3.2",
+      "sha256": "cb6ed6475d21eb8d30754131bd24003c114096bfa84ffccf334dc11cf8ac60cc",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3.2.tar.gz",
+      "build_number": "253.29346.170"
    },
    "dataspell": {
      "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "1e4bc499da1ce8c63e8a4526159c20ef8a797315dc6d3ab4c8eb109f323faba6",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.2.3.tar.gz",
-      "build_number": "252.27397.129"
+      "version": "2025.3.1",
+      "sha256": "37f13426ce4f5d859d7db246f2328ccbad61adf361d43c784cb6932af6644c28",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.3.1.tar.gz",
+      "build_number": "253.29346.157"
    },
    "gateway": {
      "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "5a84a4dbc5fc1aa03fa1bf142e1eae51e265f6d17ec38c50932b83e629a4366c",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.5.tar.gz",
-      "build_number": "252.28238.6"
+      "version": "2025.3",
+      "sha256": "90c8a54f619245a5435c343f94f39595ab59cd3cbada569e2b1e28bcacdbcb4a",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.tar.gz",
+      "build_number": "253.28294.342"
    },
    "goland": {
      "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "7b748b7f5af267e8bd4d90d44bbeea8cb58b262115d884d2cd567af8d9d753c1",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.5.tar.gz",
-      "build_number": "252.28238.32"
+      "version": "2025.3",
+      "sha256": "6151856286ea546eb8af9aeb025772cee6bd57134f45494a818e8da20a8691c6",
+      "url": "https://download.jetbrains.com/go/goland-2025.3.tar.gz",
+      "build_number": "253.28294.337"
    },
    "idea-community": {
      "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
@@ -51,24 +51,24 @@
    },
    "idea": {
      "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "dc92cd3850ba256d2cb1c9d884f9579f613f6fa747f628361458d21f66687393",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.5.tar.gz",
-      "build_number": "252.28238.7"
+      "version": "2025.3.1",
+      "sha256": "21e1b90b5ec684767a03498ba424ef3f9acc5dbf759cceefd5edd474f043ad6c",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.3.1.tar.gz",
+      "build_number": "253.29346.138"
    },
    "mps": {
      "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
-      "version": "2025.2.1",
-      "sha256": "cfbe530d0385cf3e9ccc2f18f43db25525e0024abdbcd3203bd66fb77fc6f3b4",
-      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.1.tar.gz",
-      "build_number": "252.26199.587"
+      "version": "2025.3",
+      "sha256": "c4023e52b4e17824d61d2768238619be14e5ae5735db533e3951647f377b6b79",
+      "url": "https://download.jetbrains.com/mps/2025.3/MPS-2025.3.tar.gz",
+      "build_number": "253.28294.432"
    },
    "phpstorm": {
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "4f102bb85add2527e46695f3b866c0e315423e19bc45e0adb0de0fe577a1efe6",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.5.tar.gz",
-      "build_number": "252.28238.9",
+      "version": "2025.3.1",
+      "sha256": "fd8937ab6b79605cefc9917ffe6a08e05a6b7cc0256fa2178623d24ec322fa29",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.tar.gz",
+      "build_number": "253.29346.151",
      "version-major-minor": "2022.3"
    },
    "pycharm-community": {
@@ -80,38 +80,38 @@
    },
    "pycharm": {
      "url-template": "https://download.jetbrains.com/python/pycharm-{version}.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "b1e47419e5844c38e7a7a9be9e5260c75cea6aa8423f2584dc1727f792d5feb4",
-      "url": "https://download.jetbrains.com/python/pycharm-2025.2.5.tar.gz",
-      "build_number": "252.28238.29"
+      "version": "2025.3.1",
+      "sha256": "933fd42d7cc2a76ad4ba23f9112294e4df013fa4c3362435a1e3368051c07391",
+      "url": "https://download.jetbrains.com/python/pycharm-2025.3.1.tar.gz",
+      "build_number": "253.29346.142"
    },
    "rider": {
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
-      "version": "2025.3.0.3",
-      "sha256": "f09d5e060df110316e8abdedc397e6475e5d46d3f99b422d06de69f6e7025dbc",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.0.3.tar.gz",
-      "build_number": "253.28294.237"
+      "version": "2025.3.1",
+      "sha256": "ba840f7c48da7f118cf57aa8c22df30120d16f175fbce3bec6a65590ed87f2e8",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.1.tar.gz",
+      "build_number": "253.29346.144"
    },
    "ruby-mine": {
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "9d42262fa938e072a83828bd643c6d702b07e4a45c095315500a2a60d7bb805c",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.5.tar.gz",
-      "build_number": "252.28238.3"
+      "version": "2025.3.1",
+      "sha256": "e9eb2011ca2d5694c58c011690bf544d026e3a7c1c0c8de9bb37a18fa0cf8118",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.3.1.tar.gz",
+      "build_number": "253.29346.140"
    },
    "rust-rover": {
      "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "01ec30397ec61ac6dcb66cb037ea69b2be8a7e079020e50513f2e1e102ccfc84",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.5.tar.gz",
-      "build_number": "252.28238.28"
+      "version": "2025.3.1",
+      "sha256": "5a1b34e10a1c59eee30694236baa8233c7787580769381be01b4ccb09618ec89",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.3.1.tar.gz",
+      "build_number": "253.29346.139"
    },
    "webstorm": {
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "535167a94350f355e8d4b63624df25c9eca58e5f570df596c7ca8ab630f3c485",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.5.tar.gz",
-      "build_number": "252.28238.10"
+      "version": "2025.3.1",
+      "sha256": "08a851d216b741c49ebb6846e178fb823d329fe7b9824a2134b68c8fd25ba2ae",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1.tar.gz",
+      "build_number": "253.29346.143"
    },
    "writerside": {
      "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.tar.gz",
@@ -131,38 +131,38 @@
    },
    "clion": {
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "bff9d778fdfa41dc69019f05b01a9f242caa4406432f63b9d599799790f62655",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.5-aarch64.tar.gz",
-      "build_number": "252.28238.22"
+      "version": "2025.3.1",
+      "sha256": "b96c38c3d2f7ff7b988d75c970fd0e90363e09b8273106defc9ae3defa868ed7",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.3.1-aarch64.tar.gz",
+      "build_number": "253.29346.141"
    },
    "datagrip": {
      "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz",
-      "version": "2025.3",
-      "sha256": "52a2e70f8903ee70ceb7fd45216f5d3ac35718ba066b30cb084c6bcacf9a5098",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3-aarch64.tar.gz",
-      "build_number": "253.28294.259"
+      "version": "2025.3.2",
+      "sha256": "1a6feb3aa255dace332cc18b868593181b6ea62c3d9f0d36f90032ca0517d068",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3.2-aarch64.tar.gz",
+      "build_number": "253.29346.170"
    },
    "dataspell": {
      "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "4bebb406617b4179791d4b6560dc50355760773ef37f6ce9f27bd0d1fd638750",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.2.3-aarch64.tar.gz",
-      "build_number": "252.27397.129"
+      "version": "2025.3.1",
+      "sha256": "40afd38cc704cdff2be89b9f0d67bdbcb1699d7b37b25d34d44d2d52ef6a46d3",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.3.1-aarch64.tar.gz",
+      "build_number": "253.29346.157"
    },
    "gateway": {
      "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "62cb3723786e66aec656561cc37f31bf232346be303184e3e73018e85b252430",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.5-aarch64.tar.gz",
-      "build_number": "252.28238.6"
+      "version": "2025.3",
+      "sha256": "204ed3f7262877d0a46aaf30c5bafb7216b4e9736bebee71425c993c18486af8",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3-aarch64.tar.gz",
+      "build_number": "253.28294.342"
    },
    "goland": {
      "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "c9bdfe1a106c470ee335d779ab59f61898098d4769dac8c2975113dba6d8dcf5",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.5-aarch64.tar.gz",
-      "build_number": "252.28238.32"
+      "version": "2025.3",
+      "sha256": "c530dd4bcc7a075a040b64859ecb34142c8fc0399625c5a13ae2d7a8f5974340",
+      "url": "https://download.jetbrains.com/go/goland-2025.3-aarch64.tar.gz",
+      "build_number": "253.28294.337"
    },
    "idea-community": {
      "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz",
@@ -173,24 +173,24 @@
    },
    "idea": {
      "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "6203b9dbc2461abc59604a7fb319d8e06948b2886489ae03499e98f4c1a0a57c",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.5-aarch64.tar.gz",
-      "build_number": "252.28238.7"
+      "version": "2025.3.1",
+      "sha256": "095711329d1e9c14641ba426e652d4dbd3885b27c9a046e44725ae677491e8c3",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.3.1-aarch64.tar.gz",
+      "build_number": "253.29346.138"
    },
    "mps": {
      "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
-      "version": "2025.2.1",
-      "sha256": "cfbe530d0385cf3e9ccc2f18f43db25525e0024abdbcd3203bd66fb77fc6f3b4",
-      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.1.tar.gz",
-      "build_number": "252.26199.587"
+      "version": "2025.3",
+      "sha256": "c4023e52b4e17824d61d2768238619be14e5ae5735db533e3951647f377b6b79",
+      "url": "https://download.jetbrains.com/mps/2025.3/MPS-2025.3.tar.gz",
+      "build_number": "253.28294.432"
    },
    "phpstorm": {
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "9dbf2ef4f69039f82ed1c4f279a22d5e1cb88051bcf5670e7c4d5bf0263295e9",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.5-aarch64.tar.gz",
-      "build_number": "252.28238.9",
+      "version": "2025.3.1",
+      "sha256": "7648667f85b4c45928b04d4c26f22882a8aa65a787a64fa2f7affe51a1bc2a61",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.3.1-aarch64.tar.gz",
+      "build_number": "253.29346.151",
      "version-major-minor": "2022.3"
    },
    "pycharm-community": {
@@ -202,38 +202,38 @@
    },
    "pycharm": {
      "url-template": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "7037672c6913f643ec4979ca5f16791588e001ffd39f830d874587f79e358be2",
-      "url": "https://download.jetbrains.com/python/pycharm-2025.2.5-aarch64.tar.gz",
-      "build_number": "252.28238.29"
+      "version": "2025.3.1",
+      "sha256": "2b6f5a430132773ea7caf3046f7763ea7a031dbfab6e1be72bdc86f3cc7a758b",
+      "url": "https://download.jetbrains.com/python/pycharm-2025.3.1-aarch64.tar.gz",
+      "build_number": "253.29346.142"
    },
    "rider": {
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz",
-      "version": "2025.3.0.3",
-      "sha256": "eb3727a2c4159e185b839b0ee0c2ee7383d4bc5a8ef3c1f41dbd59ae7cb705d6",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.0.3-aarch64.tar.gz",
-      "build_number": "253.28294.237"
+      "version": "2025.3.1",
+      "sha256": "19080fcdc48fa0f743ed60927b71975a3c478b805296161cfd8a0aa2c04c8f52",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.1-aarch64.tar.gz",
+      "build_number": "253.29346.144"
    },
    "ruby-mine": {
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "1dd8720dbb32a9ae6ed9856834baf5242aa8296ed179fee3e5b7be432f993155",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.5-aarch64.tar.gz",
-      "build_number": "252.28238.3"
+      "version": "2025.3.1",
+      "sha256": "bf603c6a1ba1e618afdb70589648447cfce53b4daa7a0cc68073c1b77e727d55",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.3.1-aarch64.tar.gz",
+      "build_number": "253.29346.140"
    },
    "rust-rover": {
      "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "8e424e01a38faebbfd7fa36cdae51e233551f921a666e36a0a0a6a04e686fa0a",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.5-aarch64.tar.gz",
-      "build_number": "252.28238.28"
+      "version": "2025.3.1",
+      "sha256": "fb0f81c9d2a2a604718484954b261a642be9ed6f51de98fcdc6cedb32b0a4c9e",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.3.1-aarch64.tar.gz",
+      "build_number": "253.29346.139"
    },
    "webstorm": {
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",
-      "version": "2025.2.5",
-      "sha256": "d4a474c7434878906ed9d3c92572ac61c6fe8eb7dc48653677e2ead1785f4551",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.5-aarch64.tar.gz",
-      "build_number": "252.28238.10"
+      "version": "2025.3.1",
+      "sha256": "fd8bb3ee70c549165d9102437bca03e857fc147281c1d7382249d4690c31dd87",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1-aarch64.tar.gz",
+      "build_number": "253.29346.143"
    },
    "writerside": {
      "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.tar.gz",
@@ -253,38 +253,38 @@
    },
    "clion": {
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
-      "version": "2025.2.5",
-      "sha256": "234b93f26fbb411393dbfd7d1084ff8e8d35b745778d4b9ed1ecba670dafe0fb",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.5.dmg",
-      "build_number": "252.28238.22"
+      "version": "2025.3.1",
+      "sha256": "9a8174c9229f9c86f86da1a8e2bdab52ffb369ea0781b57eb245703ebc8307e2",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.3.1.dmg",
+      "build_number": "253.29346.141"
    },
    "datagrip": {
      "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
-      "version": "2025.3",
-      "sha256": "4a92e083ddc6edb7ff1639705d6bd3cf8d47d960659a9aa71e19b95fafad8d07",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3.dmg",
-      "build_number": "253.28294.259"
+      "version": "2025.3.2",
+      "sha256": "0383a0a4f2fde583b62ea7d342e5718b0fa306fc8349541c75bec5ae841fb4fc",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3.2.dmg",
+      "build_number": "253.29346.170"
    },
    "dataspell": {
      "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg",
-      "version": "2025.2.3",
-      "sha256": "7d1a60c4367a1e1bd43aec494177c4c30744cb5bf904a3c71d2a3d13439a7b12",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.2.3.dmg",
-      "build_number": "252.27397.129"
+      "version": "2025.3.1",
+      "sha256": "388d956dd6243697a162c062c76b2fee4098f4f3405badb07a69ce6df7de6017",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.3.1.dmg",
+      "build_number": "253.29346.157"
    },
    "gateway": {
      "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
-      "version": "2025.2.5",
-      "sha256": "a0a4314c5f08331a82420580bf3e26df19b52573cda3ecac354d8ac49caf191d",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.5.dmg",
-      "build_number": "252.28238.6"
+      "version": "2025.3",
+      "sha256": "282fd7f302d95adeed022f8d6c679d3292778f96205394af52dd090f6201f338",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.dmg",
+      "build_number": "253.28294.342"
    },
    "goland": {
      "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
-      "version": "2025.2.5",
-      "sha256": "b900b868b748b78c01c5da949e8bcc0df277caa2e3efcc50898641aadaf485f2",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.5.dmg",
-      "build_number": "252.28238.32"
+      "version": "2025.3",
+      "sha256": "e1df4f10b158c7788736559666244e994500a40db5b08661e2691357d269dbf4",
+      "url": "https://download.jetbrains.com/go/goland-2025.3.dmg",
+      "build_number": "253.28294.337"
    },
    "idea-community": {
      "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
@@ -295,24 +295,24 @@
    },
    "idea": {
      "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
-      "version": "2025.2.5",
-      "sha256": "c0d6731d60bdcdaaea5c0474c296e39cc336f424da872c6ed022e8f139d779ee",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.5.dmg",
-      "build_number": "252.28238.7"
+      "version": "2025.3.1",
+      "sha256": "adf5af3839e07ba6387bf0eca94df2f44c829023a1898170eacbc5cbafce0393",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.3.1.dmg",
+      "build_number": "253.29346.138"
    },
    "mps": {
      "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg",
-      "version": "2025.2.1",
-      "sha256": "e0b2644918ffe76b10001fc7904a58b2ec88cda2d317b10508d3bac784a490b2",
-      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.1-macos.dmg",
-      "build_number": "252.26199.587"
+      "version": "2025.3",
+      "sha256": "c216008ca905efd9ab9271df9599ef38ecb66cba2c61482e7a56434ae3eddee6",
+      "url": "https://download.jetbrains.com/mps/2025.3/MPS-2025.3-macos.dmg",
+      "build_number": "253.28294.432"
    },
    "phpstorm": {
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
-      "version": "2025.2.5",
-      "sha256": "2a765be05bd2176899297ba0599735c2a13d1065e9d65895a6ead7ed850f0254",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.5.dmg",
-      "build_number": "252.28238.9",
+      "version": "2025.3.1",
+      "sha256": "11988bcee5d94b271ea67aeacd3e836029595a6cfebfec2659565fc18a4ad2d1",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.dmg",
+      "build_number": "253.29346.151",
      "version-major-minor": "2022.3"
    },
    "pycharm-community": {
@@ -324,38 +324,38 @@
    },
    "pycharm": {
      "url-template": "https://download.jetbrains.com/python/pycharm-{version}.dmg",
-      "version": "2025.2.5",
-      "sha256": "00eccdeb39bd8eeaed1b98ad99f542fbc3851389f9e7d19355d05dfd979eb669",
-      "url": "https://download.jetbrains.com/python/pycharm-2025.2.5.dmg",
-      "build_number": "252.28238.29"
+      "version": "2025.3.1",
+      "sha256": "586c9eed67da609fc1e565a8bfc36eb155b23e5483d5dc6e9dcf8b5540f47fa5",
+      "url": "https://download.jetbrains.com/python/pycharm-2025.3.1.dmg",
+      "build_number": "253.29346.142"
    },
    "rider": {
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
-      "version": "2025.3.0.3",
-      "sha256": "e8261d30d549f1809228c84e4b31d2cae337cb7bc35cd6da4e0f801e4d2f52db",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.0.3.dmg",
-      "build_number": "253.28294.237"
+      "version": "2025.3.1",
+      "sha256": "addd816dbdf130e2ef5e7dc184d7a8087f8bfbf6eba4e32ead2452069a49607d",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.1.dmg",
+      "build_number": "253.29346.144"
    },
    "ruby-mine": {
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
-      "version": "2025.2.5",
-      "sha256": "7dedc215b849194f8814380a4e622e117346fb52fc3f102bfa53332d33c9433b",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.5.dmg",
-      "build_number": "252.28238.3"
+      "version": "2025.3.1",
+      "sha256": "4fce84983a6ace16d8479150b765280250a260b3d24fb37258d114000c6c1115",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.3.1.dmg",
+      "build_number": "253.29346.140"
    },
    "rust-rover": {
      "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
-      "version": "2025.2.5",
-      "sha256": "1f149d98d41b3929e3e920d5465eaa9963312d93f106d8821d0c51721ae2609c",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.5.dmg",
-      "build_number": "252.28238.28"
+      "version": "2025.3.1",
+      "sha256": "3899875452a5182db93b132c00dbc84394ffb637430b97f2390be8abb0412537",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.3.1.dmg",
+      "build_number": "253.29346.139"
    },
    "webstorm": {
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
-      "version": "2025.2.5",
-      "sha256": "1f3779bf695758e830126a95734360bd640794ec278c250fad9a71969de4ee39",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.5.dmg",
-      "build_number": "252.28238.10"
+      "version": "2025.3.1",
+      "sha256": "a6cb906562f95b37e9c1e34c9bd9561dea653a726c95d02bfa957acbe909b88d",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1.dmg",
+      "build_number": "253.29346.143"
    },
    "writerside": {
      "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.dmg",
@@ -375,38 +375,38 @@
    },
    "clion": {
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
-      "version": "2025.2.5",
-      "sha256": "b0496540a133c82c64ac959f1d4542fe331bd63403fd230e23adf4bc957c84af",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.5-aarch64.dmg",
-      "build_number": "252.28238.22"
+      "version": "2025.3.1",
+      "sha256": "11cae8aeb43d1870d96980f1d927ff545fabed989f3bf4e7327911b441e149f1",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.3.1-aarch64.dmg",
+      "build_number": "253.29346.141"
    },
    "datagrip": {
      "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
-      "version": "2025.3",
-      "sha256": "16a5df01852648a82082fb667bbed6fcb43e15ef9a91e35a0be422dd37d07180",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3-aarch64.dmg",
-      "build_number": "253.28294.259"
+      "version": "2025.3.2",
+      "sha256": "a7224548dc9da3863727b0c11cef9d613fd951d16baa016ca1407c56a9ec6964",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3.2-aarch64.dmg",
+      "build_number": "253.29346.170"
    },
    "dataspell": {
      "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg",
-      "version": "2025.2.3",
-      "sha256": "ad8a2d8403c7d44f66d0905ab6d28a3e888e78b9cc140725e7ca744257c6ce58",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.2.3-aarch64.dmg",
-      "build_number": "252.27397.129"
+      "version": "2025.3.1",
+      "sha256": "fe0d8ef15e6e36af0ea4361bd474f204ee5c307ef90af8ec833976a1dae5a5a3",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.3.1-aarch64.dmg",
+      "build_number": "253.29346.157"
    },
    "gateway": {
      "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
-      "version": "2025.2.5",
-      "sha256": "af0a82a46ecad837ee6c86d97623e58d377eed7d5ee56c7af5765071e0b0c12e",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.5-aarch64.dmg",
-      "build_number": "252.28238.6"
+      "version": "2025.3",
+      "sha256": "b10cabda93c88d27bcc135a44a1fd98fe60fe8305606d6e75a0d5b736f0df274",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3-aarch64.dmg",
+      "build_number": "253.28294.342"
    },
    "goland": {
      "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
-      "version": "2025.2.5",
-      "sha256": "91faea3e0aff80e16a27cacaec1c39ef13eac2b3da1b0f0aa1af667be96f4c78",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.5-aarch64.dmg",
-      "build_number": "252.28238.32"
+      "version": "2025.3",
+      "sha256": "d4ee20b5c3df6151d366d6cc9b06b915499ff0c1eb1184aab53a01078908ec89",
+      "url": "https://download.jetbrains.com/go/goland-2025.3-aarch64.dmg",
+      "build_number": "253.28294.337"
    },
    "idea-community": {
      "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
@@ -417,24 +417,24 @@
    },
    "idea": {
      "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
-      "version": "2025.2.5",
-      "sha256": "6ec8cf520556c75e91a3cae1c54f464dee3609c4d7efef3bb307b129c7d9cb63",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.5-aarch64.dmg",
-      "build_number": "252.28238.7"
+      "version": "2025.3.1",
+      "sha256": "2137863cc3a5f4acd25ba38a82e004e935d3a94fa566f8e3851d6b8a8ac12777",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.3.1-aarch64.dmg",
+      "build_number": "253.29346.138"
    },
    "mps": {
      "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg",
-      "version": "2025.2.1",
-      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.1-macos-aarch64.dmg",
-      "sha256": "d409c82b06cab622dc469d6929e291e40b81b21e1e4b784833d07eb7697f5f61",
-      "build_number": "252.26199.587"
+      "version": "2025.3",
+      "url": "https://download.jetbrains.com/mps/2025.3/MPS-2025.3-macos-aarch64.dmg",
+      "sha256": "dc79c41ce851448f4862306173914eee1e63e230410ed65356498efd2d5f0444",
+      "build_number": "253.28294.432"
    },
    "phpstorm": {
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
-      "version": "2025.2.5",
-      "sha256": "8320ce229c03277f53a836bc19b796e9241bb00e3e40d4f048290baa27aa9a90",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.5-aarch64.dmg",
-      "build_number": "252.28238.9",
+      "version": "2025.3.1",
+      "sha256": "0453e0a6ee86c3cbf97b8c48f2826751d8085bf8211b541a04752621c5af16bc",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.3.1-aarch64.dmg",
+      "build_number": "253.29346.151",
      "version-major-minor": "2022.3"
    },
    "pycharm-community": {
@@ -446,38 +446,38 @@
    },
    "pycharm": {
      "url-template": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.dmg",
-      "version": "2025.2.5",
-      "sha256": "71da1283259bc59897e5bb43c6c3771a72d026419ed4d79192889ea3885ac0de",
-      "url": "https://download.jetbrains.com/python/pycharm-2025.2.5-aarch64.dmg",
-      "build_number": "252.28238.29"
+      "version": "2025.3.1",
+      "sha256": "ec8e97856f00da902020c72b0f079cc10983de6bb4438292ea5faa1e5b0cb935",
+      "url": "https://download.jetbrains.com/python/pycharm-2025.3.1-aarch64.dmg",
+      "build_number": "253.29346.142"
    },
    "rider": {
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
-      "version": "2025.3.0.3",
-      "sha256": "ff03408013ce86ffd437204d635401a4ca673ee15596e3d93cd9c69e63e7e7c3",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.0.3-aarch64.dmg",
-      "build_number": "253.28294.237"
+      "version": "2025.3.1",
+      "sha256": "d7080323412900f5d37270233e5a4c773011c6853d6031ce1f5e635c77511426",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.1-aarch64.dmg",
+      "build_number": "253.29346.144"
    },
    "ruby-mine": {
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
-      "version": "2025.2.5",
-      "sha256": "8527cb286ea5d9cd612538cb55354dc689b7f7fe5ec0b81a8f1a4a2279e94351",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.5-aarch64.dmg",
-      "build_number": "252.28238.3"
+      "version": "2025.3.1",
+      "sha256": "67f1aa674b90ec54ba21f3523ad940218f979befd7429e38ad822bc8146d16a4",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.3.1-aarch64.dmg",
+      "build_number": "253.29346.140"
    },
    "rust-rover": {
      "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg",
-      "version": "2025.2.5",
-      "sha256": "7927f48c24ff1e9b235f3f6bbcd74fb1fad907035146a04c55ef62ccdf90c087",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.5-aarch64.dmg",
-      "build_number": "252.28238.28"
+      "version": "2025.3.1",
+      "sha256": "103a12ed1c37b6b38cff5d637e7dc7b8dcc78f5c576ba38b8f862c6ba3647d52",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.3.1-aarch64.dmg",
+      "build_number": "253.29346.139"
    },
    "webstorm": {
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
-      "version": "2025.2.5",
-      "sha256": "729d519244a4be15add4b0963ebf84fb9c3f3f2f7d1eab3ad925ef79fe359773",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.5-aarch64.dmg",
-      "build_number": "252.28238.10"
+      "version": "2025.3.1",
+      "sha256": "1c21990cee2bbbffdd8f6c90e8071bc03ec7fe5a3662e51931c15222d4b7ccb2",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1-aarch64.dmg",
+      "build_number": "253.29346.143"
    },
    "writerside": {
      "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.dmg",
@@ -215,66 +215,74 @@ let

  grammarToPlugin =
    grammar:
-    let
-      name = lib.pipe grammar [
-        lib.getName
+    # If the grammar has already been processed by this function, return it as-is.
+    # This makes the function idempotent and prevents double-wrapping which mangles
+    # the names of the generated parser files.
+    if grammar ? origGrammar then
+      grammar
+    else
+      let
+        name = lib.pipe grammar [
+          lib.getName

-        # added in buildGrammar
-        (lib.removeSuffix "-grammar")
+          # added in buildGrammar
+          (lib.removeSuffix "-grammar")

-        # grammars from tree-sitter.builtGrammars
-        (lib.removePrefix "tree-sitter-")
-        (lib.replaceStrings [ "-" ] [ "_" ])
-      ];
+          # grammars from tree-sitter.builtGrammars
+          (lib.removePrefix "tree-sitter-")
+          (lib.replaceStrings [ "-" ] [ "_" ])
+        ];

-      nvimGrammars = lib.mapAttrsToList (
-        name: value:
-        value.origGrammar
-          or (throw "additions to `pkgs.vimPlugins.nvim-treesitter.grammarPlugins` set should be passed through `pkgs.neovimUtils.grammarToPlugin` first")
-      ) vimPlugins.nvim-treesitter.grammarPlugins;
-      isNvimGrammar = x: builtins.elem x nvimGrammars;
+        nvimGrammars = lib.mapAttrsToList (
+          name: value:
+          value.origGrammar
+            or (throw "additions to `pkgs.vimPlugins.nvim-treesitter.grammarPlugins` set should be passed through `pkgs.neovimUtils.grammarToPlugin` first")
+        ) vimPlugins.nvim-treesitter.grammarPlugins;
+        isNvimGrammar = x: builtins.elem x nvimGrammars;

-      toNvimTreesitterGrammar = makeSetupHook {
-        name = "to-nvim-treesitter-grammar";
-      } ./to-nvim-treesitter-grammar.sh;
-    in
+        toNvimTreesitterGrammar = makeSetupHook {
+          name = "to-nvim-treesitter-grammar";
+        } ./to-nvim-treesitter-grammar.sh;
+      in

-    (toVimPlugin (
-      stdenv.mkDerivation {
-        name = "treesitter-grammar-${name}";
+      (toVimPlugin (
+        stdenv.mkDerivation {
+          name = "nvim-treesitter-grammar-${name}";

-        origGrammar = grammar;
-        grammarName = name;
+          origGrammar = grammar;
+          grammarName = name;

-        # Queries for nvim-treesitter's (not just tree-sitter's) officially
-        # supported languages are bundled with nvim-treesitter
-        # Queries from repositories for such languages are incompatible
-        # with nvim's implementation of treesitter.
-        #
-        # We try our best effort to only include queries for niche languages
-        # (there are grammars for them in nixpkgs, but they're in
-        # `tree-sitter-grammars.tree-sitter-*`; `vimPlugins.nvim-treesitter-parsers.*`
-        # only includes officially supported languages)
-        #
-        # To use grammar for a niche language, users usually do:
-        #   packages.all.start = with final.vimPlugins; [
-        #     (pkgs.neovimUtils.grammarToPlugin pkgs.tree-sitter-grammars.tree-sitter-LANG)
-        #   ]
-        #
-        # See also https://github.com/NixOS/nixpkgs/pull/344849#issuecomment-2381447839
-        installQueries = !isNvimGrammar grammar;
+          # Queries for nvim-treesitter's (not just tree-sitter's) officially
+          # supported languages are bundled with nvim-treesitter
+          # Queries from repositories for such languages are incompatible
+          # with nvim's implementation of treesitter.
+          #
+          # We try our best effort to only include queries for niche languages
+          # (there are grammars for them in nixpkgs, but they're in
+          # `tree-sitter-grammars.tree-sitter-*`; `vimPlugins.nvim-treesitter-parsers.*`
+          # only includes officially supported languages)
+          #
+          # To use grammar for a niche language, users usually do:
+          #   packages.all.start = with final.vimPlugins; [
+          #     (pkgs.neovimUtils.grammarToPlugin pkgs.tree-sitter-grammars.tree-sitter-LANG)
+          #   ]
+          #
+          # See also https://github.com/NixOS/nixpkgs/pull/344849#issuecomment-2381447839
+          installQueries = !isNvimGrammar grammar;

-        dontUnpack = true;
-        __structuredAttrs = true;
+          dontUnpack = true;
+          __structuredAttrs = true;

-        nativeBuildInputs = [ toNvimTreesitterGrammar ];
+          nativeBuildInputs = [ toNvimTreesitterGrammar ];

-        meta = {
-          platforms = lib.platforms.all;
+          passthru = grammar.passthru or { };
+
+          meta = {
+            platforms = lib.platforms.all;
+          }
+          // grammar.meta;
        }
-        // grammar.meta;
-      }
-    ));
+      ));

  /*
    Fork of vimUtils.packDir that additionally generates a propagated-build-inputs-file that
@@ -12000,12 +12000,12 @@ final: prev: {

  nvim-treesitter = buildVimPlugin {
    pname = "nvim-treesitter";
-    version = "0.10.0-unstable-2025-05-24";
+    version = "0.10.0-unstable-2025-12-29";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "42fc28ba918343ebfd5565147a42a26580579482";
-      hash = "sha256-CVs9FTdg3oKtRjz2YqwkMr0W5qYLGfVyxyhE3qnGYbI=";
+      rev = "7efc1b58a8061d29786860006c7257c90a5196dc";
+      hash = "sha256-AMEzUaVVPzHT7vpPJUFt5UbBiN9tygH5UMio/lU/baw=";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
    meta.hydraPlatforms = [ ];
@@ -2,4 +2,4 @@
  lib,
  vimPlugins,
 }:
-lib.recurseIntoAttrs vimPlugins.nvim-treesitter.grammarPlugins
+lib.recurseIntoAttrs vimPlugins.nvim-treesitter.parsers
@@ -1,12 +1,13 @@
 {
  lib,
  callPackage,
+  symlinkJoin,
+  vimUtils,
  tree-sitter,
  neovim,
  neovimUtils,
  runCommand,
  vimPlugins,
-  tree-sitter-grammars,
  writableTmpDirAsHomeHook,
 }:

@@ -15,18 +16,43 @@ self: super:
 let
  inherit (neovimUtils) grammarToPlugin;

-  overrides = prev: {
+  buildQueries =
+    { language }:
+    vimUtils.toVimPlugin (
+      runCommand "nvim-treesitter-queries-${language}"
+        {
+          passthru = { inherit language; };
+          meta.description = "Queries for ${language} from nvim-treesitter";
+        }
+        ''
+          mkdir -p "$out/queries"
+          if [ -d "${super.nvim-treesitter.src}/runtime/queries/${language}" ]; then
+            ln -s "${super.nvim-treesitter.src}/runtime/queries/${language}" "$out/queries/${language}"
+          else
+            echo "Error: there are no queries for ${language}."
+            exit 1
+          fi
+        ''
+    );
+
+  generated = callPackage ./generated.nix {
+    inherit (tree-sitter) buildGrammar;
+    inherit buildQueries;
  };

-  generatedGrammars =
-    let
-      generated = callPackage ./generated.nix {
-        inherit (tree-sitter) buildGrammar;
-      };
-    in
-    lib.overrideExisting generated (overrides generated);
+  inherit (generated) parsers queries;

-  generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars;
+  parsersWithMeta = lib.mapAttrs (
+    lang: parser:
+    if lib.hasAttr lang queries then
+      parser.overrideAttrs (old: {
+        passthru = (old.passthru or { }) // {
+          associatedQuery = queries.${lang};
+        };
+      })
+    else
+      parser
+  ) parsers;

  # add aliases so grammars from `tree-sitter` are overwritten in `withPlugins`
  # for example, for ocaml_interface, the following aliases will be added
@@ -34,7 +60,7 @@ let
  #   tree-sitter-ocaml-interface
  #   tree-sitter-ocaml_interface
  builtGrammars =
-    generatedGrammars
+    parsersWithMeta
    // lib.concatMapAttrs (
      k: v:
      let
@@ -47,9 +73,9 @@ let
        ${replaced} = v;
        "tree-sitter-${replaced}" = v;
      }
-    ) generatedDerivations;
+    ) parsersWithMeta;

-  allGrammars = lib.attrValues generatedDerivations;
+  allGrammars = lib.attrValues parsersWithMeta;

  # Usage:
  # pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ p.c p.java ... ])
@@ -57,28 +83,44 @@ let
  # pkgs.vimPlugins.nvim-treesitter.withAllGrammars
  withPlugins =
    f:
+    let
+      selectedGrammars = f (tree-sitter.builtGrammars // builtGrammars);
+
+      grammarPlugins = map grammarToPlugin selectedGrammars;
+
+      queryPlugins = lib.pipe selectedGrammars [
+        (map (g: g.passthru.associatedQuery or null))
+        (lib.filter (q: q != null))
+      ];
+    in
    self.nvim-treesitter.overrideAttrs {
-      passthru.dependencies = map grammarToPlugin (f (tree-sitter.builtGrammars // builtGrammars));
+      passthru.dependencies = [
+        (symlinkJoin {
+          name = "nvim-treesitter-grammars";
+          paths = grammarPlugins ++ queryPlugins;
+        })
+      ];
    };

  withAllGrammars = withPlugins (_: allGrammars);
+  grammarPlugins = lib.mapAttrs (_: grammarToPlugin) parsersWithMeta;
 in
-
 {
-  postPatch = ''
-    rm -r parser
-  '';
+  nvimSkipModules = [ "nvim-treesitter._meta.parsers" ];

-  passthru = (super.nvim-treesitter.passthru or { }) // {
+  passthru = super.nvim-treesitter.passthru or { } // {
    inherit
+      buildQueries
      builtGrammars
      allGrammars
+      grammarPlugins
      grammarToPlugin
      withPlugins
      withAllGrammars
+      queries
      ;

-    grammarPlugins = lib.mapAttrs (_: grammarToPlugin) generatedDerivations;
+    parsers = grammarPlugins;

    tests = {
      check-queries =
@@ -100,7 +142,7 @@ in
            ln -s ${withAllGrammars}/CONTRIBUTING.md .
            export ALLOWED_INSTALLATION_FAILURES=ipkg,norg,verilog

-            nvim --headless "+luafile ${withAllGrammars}/scripts/check-queries.lua" | tee log
+            nvim --headless -l "${withAllGrammars}/scripts/check-queries.lua" | tee log

            if grep -q Warning log; then
              echo "WARNING: warnings were emitted by the check"
@@ -108,45 +150,9 @@ in
            fi
          '';

-      tree-sitter-queries-are-present-for-custom-grammars =
-        let
-          pluginsToCheck =
-            map (grammar: grammarToPlugin grammar)
-              # non-derivations are here because there is a `recurseForDerivations = true`
-              (lib.filter lib.isDerivation (lib.attrValues tree-sitter-grammars));
-        in
-        runCommand "nvim-treesitter-test-queries-are-present-for-custom-grammars" { CI = true; } ''
-          touch "$out"
-
-          function check_grammar {
-            local grammar_name="$1"
-            local grammar_path="$2"
-
-            local grammar_queries=$(find -L "$grammar_path/queries/$grammar_name" -name '*.scm')
-            local EXPECTED_FILES="$grammar_path/parser/$grammar_name.so $grammar_queries"
-
-            echo ""
-            echo "expected files for $grammar_name:"
-            echo "$EXPECTED_FILES"
-
-            # the derivation has only symlinks, and `find` doesn't count them as files
-            # so we cannot use `-type f`, thus we use `-not -type d`
-            for file in $(find -L $2 -not -type d); do
-              echo "checking $file"
-              # see https://stackoverflow.com/a/8063284
-              if ! echo "$EXPECTED_FILES" | grep -wqF "$file"; then
-                echo "$file is unexpected, exiting"
-                exit 1
-              fi
-            done
-          }
-
-          ${lib.concatLines (lib.forEach pluginsToCheck (g: "check_grammar \"${g.grammarName}\" \"${g}\""))}
-        '';
-
      no-queries-for-official-grammars =
        let
-          pluginsToCheck = lib.filter lib.isDerivation (lib.attrValues vimPlugins.nvim-treesitter-parsers);
+          pluginsToCheck = lib.filter lib.isDerivation (lib.attrValues vimPlugins.nvim-treesitter.parsers);
        in
        runCommand "nvim-treesitter-test-no-queries-for-official-grammars" { CI = true; } ''
          touch "$out"
@@ -168,10 +174,8 @@ in
    };
  };

-  meta =
-
-    (super.nvim-treesitter.meta or { }) // {
-      license = lib.licenses.asl20;
-      maintainers = [ ];
-    };
+  meta = super.nvim-treesitter.meta or { } // {
+    license = lib.licenses.asl20;
+    maintainers = [ ];
+  };
 }
@@ -13,7 +13,10 @@ import requests
 log = logging.getLogger("vim-updater")

 NURR_JSON_URL = (
-    "https://raw.githubusercontent.com/nvim-neorocks/nurr/main/tree-sitter-parsers.json"
+    "https://raw.githubusercontent.com/lumen-oss/nurr/main/tree-sitter-parsers.json"
+)
+NVIM_TREESITTER_QUERIES_URL = (
+    "https://api.github.com/repos/nvim-treesitter/nvim-treesitter/contents/runtime/queries"
 )


@@ -28,33 +31,41 @@ def generate_grammar(lang, parser_info):
    url = install_info["url"]
    rev = install_info["revision"]

-    generated = f"""  {lang} = buildGrammar {{
-    language = "{lang}";
-    version = "0.0.0+rev={rev[:7]}";
-    src = """
+    generated = f"""    {lang} = buildGrammar {{
+      language = "{lang}";
+      version = "0.0.0+rev={rev[:7]}";
+      src = """

    generated += subprocess.check_output(
-        ["nurl", url, rev, "--indent=4"], text=True
+        ["nurl", url, rev, "--indent=6"], text=True
    )
    generated += ";"

    location = install_info.get("location", "")
    if location:
        generated += f"""
-    location = "{location}";"""
+      location = "{location}";"""

    if install_info.get("generate", False):
        generated += """
-    generate = true;"""
+      generate = true;"""

    generated += f"""
-    meta.homepage = "{url}";
-  }};
+      meta.homepage = "{url}";
+    }};
 """

    return generated


+def generate_query(lang):
+    """Generate query derivation for a language"""
+    return f"""    {lang} = buildQueries {{
+      language = "{lang}";
+    }};
+"""
+
+
 def fetch_nurr_parsers():
    """Fetch the parser information from nurr repository"""
    log.info("Fetching parser data from %s", NURR_JSON_URL)
@@ -81,6 +92,25 @@ def fetch_nurr_parsers():
    return parsers


+def fetch_available_queries():
+    """Fetch list of languages that have queries in nvim-treesitter repo"""
+    log.info("Fetching available queries from %s", NVIM_TREESITTER_QUERIES_URL)
+
+    headers = {}
+    github_token = os.environ.get("GITHUB_TOKEN")
+    if github_token:
+        headers["Authorization"] = f"token {github_token}"
+
+    response = requests.get(NVIM_TREESITTER_QUERIES_URL, headers=headers, timeout=30)
+    response.raise_for_status()
+    data = response.json()
+
+    # We assume items with type="dir" in the queries/ folder are language names
+    languages = sorted([item["name"] for item in data if item["type"] == "dir"])
+    log.info(f"Found {len(languages)} languages with queries")
+    return languages
+
+
 def process_parser_info(parser_info):
    """Process a single parser info entry and generate grammar for it"""
    return generate_grammar(parser_info["lang"], parser_info)
@@ -89,12 +119,14 @@ def process_parser_info(parser_info):
 def update_grammars():
    """Update grammar definitions using nurr's parser information"""
    parsers_info = fetch_nurr_parsers()
+    queries_list = fetch_available_queries()

    generated_file = """# generated by pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py
 # Using parser data from https://github.com/nvim-neorocks/nurr/blob/main/tree-sitter-parsers.json

 {
  buildGrammar,
+  buildQueries,
  """

    nurl_output = subprocess.check_output(["nurl", "-Ls", ","], text=True).strip()
@@ -104,6 +136,7 @@ def update_grammars():
 }:

 {
+  parsers = {
 """

    # Process parsers in parallel for better performance
@@ -111,7 +144,16 @@ def update_grammars():
        for generated in executor.map(process_parser_info, parsers_info):
            generated_file += generated

-    generated_file += "}\n"
+    generated_file += """  };
+
+  queries = {
+"""
+
+    # Process queries
+    for lang in queries_list:
+        generated_file += generate_query(lang)
+
+    generated_file += "  };\n}\n"
    return generated_file


@@ -13,13 +13,13 @@
 }:
 mkLibretroCore {
  core = "ppsspp";
-  version = "0-unstable-2025-12-22";
+  version = "0-unstable-2025-12-30";

  src = fetchFromGitHub {
    owner = "hrydgard";
    repo = "ppsspp";
-    rev = "036013ef87d2ac6b9fea36dbb513617c72e11254";
-    hash = "sha256-T2fUq6Iah/vQ/NaGPE/wa2sJL888VKRpdiNq7hbFsWI=";
+    rev = "34fde065b76805c851d7c4b5bc4c67a3d347aab9";
+    hash = "sha256-se8WptzipVwAE6Qwq2hTv7xBsY22HoACdVrPv+ssBDc=";
    fetchSubmodules = true;
  };

@@ -207,7 +207,7 @@ stdenv.mkDerivation (
    # Wine locates a lot of libraries dynamically through dlopen().  Add
    # them to the RPATH so that the user doesn't have to set them in
    # LD_LIBRARY_PATH.
-    NIX_LDFLAGS = toString (
+    env.NIX_LDFLAGS = toString (
      map (path: "-rpath " + path) (
        map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ finalAttrs.buildInputs)
        # libpulsecommon.so is linked but not found otherwise
@@ -1,5 +1,5 @@
 ## build described at https://wiki.winehq.org/Building_Wine#Shared_WoW64
-preFlags="${configureFlags}"
+preFlags="${configureFlags[@]}"

 unpackPhase
 cd $TMP/$sourceRoot
@@ -10,7 +10,7 @@ mkdir -p $TMP/wine-wow $TMP/wine64

 cd $TMP/wine64
 sourceRoot=`pwd`
-configureFlags="${preFlags} --enable-win64"
+configureFlags=($preFlags --enable-win64)
 configurePhase
 buildPhase
 # checkPhase
@@ -37,7 +37,7 @@ PKG_CONFIG_PATH=$(IFS=":"; echo "${NEW_LIST_ARRAY[*]}")

 cd $TMP/wine-wow
 sourceRoot=`pwd`
-configureFlags="${preFlags} --with-wine64=../wine64"
+configureFlags=($preFlags --with-wine64=../wine64)
 configurePhase
 buildPhase
 # checkPhase
@@ -0,0 +1,36 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "apl2741-unicode";
+  version = "0-unstable-2022-11-10";
+
+  src = fetchFromGitHub {
+    owner = "abrudz";
+    repo = "APL2741";
+    rev = "1e11efae38e5095bfe49a786b111d563e83dad03";
+    hash = "sha256-/sAO+HL3zGMJZ+5SFHnkHxxevG0nJ7wo1yLTlHqYPkQ=";
+  };
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 -t $out/share/fonts/truetype *.ttf
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "APL font based on Adrian Smith's IBM Selectric APL2741 golf-ball font";
+    license = lib.licenses.unlicense;
+    homepage = "https://abrudz.github.io/APL2741/";
+    maintainers = [ lib.maintainers.sternenseemann ];
+    platforms = lib.platforms.all;
+  };
+}
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {

  meta = {
    description = "Raw converter based on RawTherapee";
-    homepage = "https://art.pixls.us";
+    homepage = "https://artraweditor.github.io";
    license = lib.licenses.gpl3Plus;
    maintainers = with lib.maintainers; [ paperdigits ];
    mainProgram = "ART";
@@ -46,6 +46,7 @@ stdenvNoCC.mkDerivation rec {
      epl10
      bsd3
    ];
+    maintainers = with lib.maintainers; [ sternenseemann ];
    platforms = lib.platforms.all;
  };
 }
@@ -14,13 +14,13 @@

 buildNpmPackage (finalAttrs: {
  pname = "bitwarden-cli";
-  version = "2025.11.0";
+  version = "2025.12.0";

  src = fetchFromGitHub {
    owner = "bitwarden";
    repo = "clients";
    tag = "cli-v${finalAttrs.version}";
-    hash = "sha256-wG0JKQKjNAEoQt/8BFIzISNNUrBqKQHPZ8DRJ69eA5s=";
+    hash = "sha256-Pas9NQKLblVuB0Gx4j6Y64Mb2+RaCg7iquSWtN4K7kU=";
  };

  patches = [
@@ -34,7 +34,7 @@ buildNpmPackage (finalAttrs: {

  nodejs = nodejs_22;

-  npmDepsHash = "sha256-/57+ch1d1VMGIMO0Kzu6o3tUX/3adgLkONNRgtyARtQ=";
+  npmDepsHash = "sha256-N7e8WKk2REEH4gP5c7k5zsu3n44hFFLxQ2X35viMuwM=";

  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
    perl
@@ -4,6 +4,8 @@
  bashNonInteractive,
  fetchurl,
  installShellFiles,
+  # Be careful if you remove this, out-of-tree consumers expect to
+  # be able to override `jdk`.
  jdk,
  rlwrap,
  makeWrapper,
@@ -6,18 +6,18 @@

 buildGoModule rec {
  pname = "cnquery";
-  version = "12.15.0";
+  version = "12.16.0";

  src = fetchFromGitHub {
    owner = "mondoohq";
    repo = "cnquery";
    tag = "v${version}";
-    hash = "sha256-Vw+jGxPQBIwrHvh5JGJss5H9DR9QnktsKlW1CRnEN4Q=";
+    hash = "sha256-dArqHTlygqlSl3+yPoG94InGfIJsw26yh2VWoaibI58=";
  };

  subPackages = [ "apps/cnquery" ];

-  vendorHash = "sha256-BKMzSdl5h9bVTNviSv7KeI7cz6QTP0jX+LU9HqWkVgo=";
+  vendorHash = "sha256-AldUs9cWsNZ5zgeBwe40b1f4NlOReY54V6O+0gkbY7Y=";

  ldflags = [
    "-w"
@@ -150,13 +150,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "fish";
-  version = "4.3.1";
+  version = "4.3.2";

  src = fetchFromGitHub {
    owner = "fish-shell";
    repo = "fish-shell";
    tag = finalAttrs.version;
-    hash = "sha256-M1/jgIbFY0VSQrHwT9/gcfA0HJ0r2cL1eJ3Y7lmmYVE=";
+    hash = "sha256-/B4U3giKGmU5B/L5HQLS1lU8f7hsfI4aCeOjWcQ1dpA=";
  };

  env = {
@@ -167,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: {

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit (finalAttrs) src patches;
-    hash = "sha256-j+V4/oxKDg4oQ+7eg34sefIMJLelOSUKXTXasQK2Z1g=";
+    hash = "sha256-/udRRs/ieLfazVTwM47ElExN40QdAG/OqQXmYurgC1I=";
  };

  patches = [
@@ -7,16 +7,16 @@
 buildNpmPackage (finalAttrs: {
  pname = "freifunk-meshviewer";

-  version = "12.7.0";
+  version = "12.8.0";

  src = fetchFromGitHub {
    owner = "freifunk";
    repo = "meshviewer";
    tag = "v${finalAttrs.version}";
-    sha256 = "sha256-nle99URK1s8v+fatpf9D0dIOIp6BKeaEYZ1PijLkt9A=";
+    sha256 = "sha256-M0ZTGH6MW8admkHvbFTgCHbRIlpDkgvSzaIfv7rDiyA=";
  };

-  npmDepsHash = "sha256-6XUe55X1WDPNldPRlgqG1C7CuGyYrS2vSiLmoza3QIs=";
+  npmDepsHash = "sha256-zrXhdR2k8HHvPBid004WtyZYPDWuRggSIkKcLVdb8Lc=";

  installPhase = ''
    mkdir -p $out/share/freifunk-meshviewer/
@@ -83,13 +83,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal";
-  version = "3.12.0";
+  version = "3.12.1";

  src = fetchFromGitHub {
    owner = "OSGeo";
    repo = "gdal";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-al7nDmUbKNP4kBMVBLWUUxn0QSAbYAJ1XhZWAVFk+sA=";
+    hash = "sha256-vs9qun9Z8o4KPxWjKOV9Lp/GgAsYW7gseYv4G7+liso=";
  };

  nativeBuildInputs = [
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "go-passbolt-cli";
-  version = "0.4.0";
+  version = "0.4.1";

  src = fetchFromGitHub {
    owner = "passbolt";
    repo = "go-passbolt-cli";
    rev = "v${version}";
-    hash = "sha256-DTgvhmNzfr7ZXjVn+znXqFL+0bHBeGofFE521H7RUI4=";
+    hash = "sha256-EytU20jdrfXwuoofp8OAphX9jjUoFpKva75PBDIFDD8=";
  };

-  vendorHash = "sha256-QLTKCb3hl/0JFO2XKfLiOtnwfR/v+WqUx4vuaO/MoXo=";
+  vendorHash = "sha256-HbwGF9ZTwWdJf7XnUKnS1n58GSaPTRlblXAmtKQoooU=";

  ldflags = [
    "-X=main.version=${version}"
@@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "hermit";
-  version = "0.46.2";
+  version = "0.47.0";

  src = fetchFromGitHub {
    rev = "v${version}";
    owner = "cashapp";
    repo = "hermit";
-    hash = "sha256-4SOwOO9ee7fKrby9sokWW/GPujT9/O+9emcaLIe+0C0=";
+    hash = "sha256-VAAdsZ3ZFY+BrH5KDERngxX5xp8CckcnlpSLq4XWU2s=";
  };

-  vendorHash = "sha256-bko9N3dbxe4K98BdG78lYYipAgAtGntrEAgoLeOY1NM=";
+  vendorHash = "sha256-KEwbADLm7oTChoLyx/0SykQX1Fy4bJxNbYcGmfEka7Q=";

  subPackages = [ "cmd/hermit" ];

@@ -16,14 +16,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "hydrus";
-  version = "652";
+  version = "653";
  format = "other";

  src = fetchFromGitHub {
    owner = "hydrusnetwork";
    repo = "hydrus";
    tag = "v${version}";
-    hash = "sha256-3N6iuKY2+desdUeEZuYSVjqHi7d89oXnPySZwdUKEtE=";
+    hash = "sha256-OH07OvN5EaEsjlUHUJMqproiVcN75yL9u7lnCjXSITo=";
  };

  nativeBuildInputs = [
@@ -8,15 +8,15 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "jsonschema-cli";
-  version = "0.37.4";
+  version = "0.38.1";

  src = fetchCrate {
    pname = "jsonschema-cli";
    inherit (finalAttrs) version;
-    hash = "sha256-qmxl4DzctXnDGeqZukMiurFoLt982ngDIo0Cum4kkcQ=";
+    hash = "sha256-W3pyT5DK8ADkWi7znuTDTq1hjRTOwhg9rSmuGZTX8r0=";
  };

-  cargoHash = "sha256-t2lRBVPk9bkvRsCxMNi30F3dkwr6angEGfD34UuH+EY=";
+  cargoHash = "sha256-C8A+cyNix0Q9OACyyPM3A74jZKNBCGz/622YsZqtY2E=";

  nativeInstallCheckInputs = [
    versionCheckHook
@@ -8,8 +8,8 @@ let
  libwacom-surface = fetchFromGitHub {
    owner = "linux-surface";
    repo = "libwacom-surface";
-    tag = "v2.16.1-1";
-    hash = "sha256-xyKG9QqL7cQH1aW66pIg7J2rikxfU/n/0iEvKXNQ1kA=";
+    tag = "v2.17.0-1";
+    hash = "sha256-0p68GMtQPlf/lX0Sl0VtttRODBKPMSeQOu3Le5JorSQ=";
  };
 in
 libwacom.overrideAttrs (prevAttrs: {
@@ -17,7 +17,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libwacom";
-  version = "2.16.1";
+  version = "2.17.0";

  outputs = [
    "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "linuxwacom";
    repo = "libwacom";
    rev = "libwacom-${finalAttrs.version}";
-    hash = "sha256-YP6z+2HyIRmIAJIdJMbVTQA0rf3EXBZvlCdM4jrmHXM=";
+    hash = "sha256-2JbO3B/PqsLKnaCeQcn1x9Z2pQL4kScuS39F1JlpDpc=";
  };

  postPatch = ''
@@ -7,13 +7,13 @@

 buildDotnetModule rec {
  pname = "lubelogger";
-  version = "1.5.5";
+  version = "1.5.6";

  src = fetchFromGitHub {
    owner = "hargata";
    repo = "lubelog";
    rev = "v${version}";
-    hash = "sha256-xoq1EgwA4MScuyVN4djqWPjlRXouMR3JnZviOIaDNUU=";
+    hash = "sha256-UzYPmNHvVYCQU2OfvJK7W5oLL0P1B7CrgMxbBvf3b28=";
  };

  projectFile = "CarCareTracker.sln";
@@ -3,7 +3,6 @@
  curl,
  dbmate,
  fetchFromGitHub,
-  go,
  lib,
  minio,
  minio-client,
@@ -26,14 +25,6 @@ let
      "-X github.com/kalbasit/ncps/cmd.Version=v${finalAttrs.version}"
    ];

-    # XXX: ncps is built with Go 1.25.5 that is available in release-25.11 but
-    # master is currently still using 1.25.4 (update waiting in the
-    # staging/staging-next branches.) This is a workaround for this issue and
-    # will automatically becomes no-op once Go is updated.
-    preBuild = lib.optionalString (go.version == "1.25.4") ''
-      sed -e 's:go 1.25.5:go 1.25.4:g' -i go.mod
-    '';
-
    vendorHash = "sha256-3YPKlz7+x7nYCqKmOroaiUyZGKIQMGFxcNyPnrA9Tio=";

    doCheck = true;
@@ -10,13 +10,13 @@
 buildNimPackage (
  finalAttrs: prevAttrs: {
    pname = "nitter";
-    version = "0-unstable-2025-10-12";
+    version = "0-unstable-2025-12-24";

    src = fetchFromGitHub {
      owner = "zedeus";
      repo = "nitter";
-      rev = "662ae90e2246c8a01c811f68750b7e5033e0fa69";
-      hash = "sha256-icjbAG/VkhzgKO2dyJYL/yc1VrVmU25Ymkz/41Ckd3M=";
+      rev = "a92e79ebc3581702dc427434a782a5fc1d28cc91";
+      hash = "sha256-bCogvVO99HPiZZOMDd0IDBNGBKIZ+My493SnbK+6HxM=";
    };

    lockFile = ./lock.json;
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "omnictl";
-  version = "1.4.4";
+  version = "1.4.6";

  src = fetchFromGitHub {
    owner = "siderolabs";
    repo = "omni";
    rev = "v${version}";
-    hash = "sha256-0dj8z7u0drd7cVDgprwEHKLZJyPyZmhDqk6nEhtr62s=";
+    hash = "sha256-p2DKfDf76xr42LLvtVFrSfxJkrpOeFUhtrViI/cD66Y=";
  };

-  vendorHash = "sha256-RdwdocSQK54f8vD7waBzYJ4DsbgdBDpUVlk4MVn6tvQ=";
+  vendorHash = "sha256-lVUe1XQr46uzx3kfj7KmoiGFUGEb7UT16IQSI8In8RU=";

  ldflags = [
    "-s"
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "portfolio_rs";
-  version = "0.6.2";
+  version = "0.7.0";

  src = fetchFromGitHub {
    owner = "MarkusZoppelt";
    repo = "portfolio_rs";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-kXpelx/6XIZGpKPY6tRwria5rnofGLnT5T+N+6jZkyw=";
+    hash = "sha256-SuukTNEfPOCCE5bg08/K7M68R2dAe75cch39whtcSWg=";
  };

-  cargoHash = "sha256-VfhqbE9XZptlUOxkYjTB3JlzNOT7i9B2khT8yCpl/sI=";
+  cargoHash = "sha256-L14Cu/Gex6FGeSEL7zcY+E6khtkH6fwzqkjHm67ALUw=";

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ openssl ];
@@ -11,14 +11,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "qpwgraph";
-  version = "0.9.7";
+  version = "0.9.8";

  src = fetchFromGitLab {
    domain = "gitlab.freedesktop.org";
    owner = "rncbc";
    repo = "qpwgraph";
    tag = "v${finalAttrs.version}";
-    sha256 = "sha256-sd97sIne8tigCDFMnEv0ruM86NfiJZoJ+jsDv3VSdsg=";
+    sha256 = "sha256-fbkRSM4HFH1f/qZgRmEz7q5kvt2YAKWu/FX2GOXHhbQ=";
  };

  nativeBuildInputs = [
@@ -9,13 +9,13 @@

 buildGoModule (finalAttrs: {
  pname = "snitch";
-  version = "0.2.1";
+  version = "0.2.2";

  src = fetchFromGitHub {
    owner = "karol-broda";
    repo = "snitch";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-V9YoyDAdH/TODVP5nGfOIh0KfsPyZVQg9Mkj7cjy3Xo=";
+    hash = "sha256-SssAiRUfUaDgAoVO2rDacru8e914Wl+4sA4JQ4Mv4eA=";
  };

  vendorHash = "sha256-fX3wOqeOgjH7AuWGxPQxJ+wbhp240CW8tiF4rVUUDzk=";
@@ -0,0 +1,38 @@
+{
+  lib,
+  fetchurl,
+  _7zz,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tableplus";
+  version = "538";
+  src = fetchurl {
+    url = "https://download.tableplus.com/macos/${finalAttrs.version}/TablePlus.dmg";
+    hash = "sha256-db3dvjEzkqWrEO+lXyImk0cVBkh8MnCwHOYKIg+kRC4=";
+  };
+
+  sourceRoot = "TablePlus.app";
+
+  nativeBuildInputs = [ _7zz ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/Applications/TablePlus.app"
+    cp -R . "$out/Applications/TablePlus.app"
+    mkdir "$out/bin"
+    ln -s "$out/Applications/TablePlus.app/Contents/MacOS/TablePlus" "$out/bin/${finalAttrs.pname}"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Database management made easy";
+    homepage = "https://tableplus.com";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ yamashitax ];
+    platforms = lib.platforms.darwin;
+  };
+})
@@ -0,0 +1,74 @@
+{
+  autoPatchelfHook,
+  dpkg,
+  fetchurl,
+  gtk3,
+  gtksourceview3,
+  krb5,
+  lib,
+  libgee,
+  libsecret,
+  libxkbcommon,
+  stdenv,
+  wrapGAppsHook3,
+  xorg,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tableplus";
+  version = "0.1.284";
+
+  src = fetchurl {
+    url = "https://web.archive.org/web/20251230232124/https://deb.tableplus.com/debian/22/pool/main/t/tableplus/tableplus_${finalAttrs.version}_amd64.deb";
+    hash = "sha256-TrYRRpjSVRD721XEd0gwGPv4RNq/uwaswPW2J8oVjXQ=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    dpkg
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    gtk3
+    gtksourceview3
+    krb5
+    libgee
+    libsecret
+    libxkbcommon
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXext
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libxcb
+  ];
+
+  unpackPhase = ''
+    dpkg-deb -x $src .
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    substituteInPlace opt/tableplus/tableplus.desktop \
+      --replace-fail "Exec=/usr/local/bin/tableplus" "Exec=tableplus" \
+      --replace-fail "Icon=/opt/tableplus/resource/image/logo.png" "Icon=tableplus"
+    install -Dt $out/bin opt/tableplus/tableplus
+    install -Dt $out/share/applications/ opt/tableplus/tableplus.desktop
+    install -Dt $out/share/icons/hicolor/256x256/apps/ opt/tableplus/resource/image/tableplus.png
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Database management made easy";
+    homepage = "https://tableplus.com";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ rhydianjenkins ];
+    platforms = lib.platforms.linux;
+    mainProgram = "tableplus";
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+})
@@ -1,38 +1,11 @@
 {
-  lib,
-  fetchurl,
-  _7zz,
+  callPackage,
  stdenv,
 }:

-stdenv.mkDerivation (finalAttrs: {
-  pname = "tableplus";
-  version = "538";
-  src = fetchurl {
-    url = "https://download.tableplus.com/macos/${finalAttrs.version}/TablePlus.dmg";
-    hash = "sha256-db3dvjEzkqWrEO+lXyImk0cVBkh8MnCwHOYKIg+kRC4=";
-  };
-
-  sourceRoot = "TablePlus.app";
-
-  nativeBuildInputs = [ _7zz ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p "$out/Applications/TablePlus.app"
-    cp -R . "$out/Applications/TablePlus.app"
-    mkdir "$out/bin"
-    ln -s "$out/Applications/TablePlus.app/Contents/MacOS/TablePlus" "$out/bin/${finalAttrs.pname}"
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Database management made easy";
-    homepage = "https://tableplus.com";
-    license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ yamashitax ];
-    platforms = lib.platforms.darwin;
-  };
-})
+if stdenv.hostPlatform.isDarwin then
+  callPackage ./darwin.nix { }
+else if stdenv.hostPlatform.isLinux then
+  callPackage ./linux.nix { }
+else
+  throw "Unsupported platform: ${stdenv.hostPlatform.system}"
@@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "theharvester";
-  version = "4.8.2";
+  version = "4.9.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "laramies";
    repo = "theharvester";
    tag = version;
-    hash = "sha256-Sui9PKpp+iMxCUbFcZE2OVDiBCxXLwR9iuXFIbd0P0k=";
+    hash = "sha256-2PiwfLqpVa29//DJJRM/zw2xFHI4cp1WE4VKsJ/zEro=";
  };

  pythonRelaxDeps = true;
@@ -33,19 +33,19 @@ python3.pkgs.buildPythonApplication rec {
    certifi
    dnspython
    fastapi
+    httpx
    lxml
    netaddr
-    ujson
    playwright
    plotly
    pyppeteer
    python-dateutil
    pyyaml
-    requests
    retrying
    shodan
    slowapi
    starlette
+    ujson
    uvicorn
    uvloop
  ];
@@ -71,7 +71,7 @@ python3.pkgs.buildPythonApplication rec {
      gathers emails, names, subdomains, IPs, and URLs using multiple public data sources.
    '';
    homepage = "https://github.com/laramies/theHarvester";
-    changelog = "https://github.com/laramies/theHarvester/releases/tag/${version}";
+    changelog = "https://github.com/laramies/theHarvester/releases/tag/${src.tag}";
    license = lib.licenses.gpl2Only;
    maintainers = with lib.maintainers; [
      c0bw3b
@@ -45,13 +45,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "ultrastardx";
-  version = "2025.12.0";
+  version = "2025.12.1";

  src = fetchFromGitHub {
    owner = "UltraStar-Deluxe";
    repo = "USDX";
    rev = "v${version}";
-    hash = "sha256-t+sfDmZmZccFndlL+v3H3qyTLD5sCsYbWmwqYtC9jK0=";
+    hash = "sha256-NwYFsd15nUgEnzQaoZdp7Au1H1QrrpoZX8PmnQ9URVA=";
  };

  nativeBuildInputs = [
@@ -18,16 +18,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "uv";
-  version = "0.9.20";
+  version = "0.9.21";

  src = fetchFromGitHub {
    owner = "astral-sh";
    repo = "uv";
    tag = finalAttrs.version;
-    hash = "sha256-q8NoNzsqSCsnQNGXNYhW1shSwrpRjoiqq6L8LEHUbVU=";
+    hash = "sha256-/Fis5719wA76HzyfVCOboXUhCVXBtGvNZm2lIhESv5o=";
  };

-  cargoHash = "sha256-E+ruzlsiyolctbnNi7vvkNO6j/5HpAir3UXz6uTbJos=";
+  cargoHash = "sha256-N0D0PSehHKioI4SWqLfCV/eoLjM6MbNySOWYabzKd4I=";

  buildInputs = [
    rust-jemalloc-sys
@@ -19,16 +19,16 @@ in

 rustPlatform.buildRustPackage rec {
  pname = "vaultwarden";
-  version = "1.34.3";
+  version = "1.35.0";

  src = fetchFromGitHub {
    owner = "dani-garcia";
    repo = "vaultwarden";
-    rev = version;
-    hash = "sha256-Dj0ySVRvBZ/57+UHas3VI8bi/0JBRqn0IW1Dq+405J0=";
+    tag = version;
+    hash = "sha256-Thj/I9eLngErUskKxnJ5Bd2Q9Hgp1e/6hWiiEyJ7lOQ=";
  };

-  cargoHash = "sha256-4sDagd2XGamBz1XvDj4ycRVJ0F+4iwHOPlj/RglNDqE=";
+  cargoHash = "sha256-/sKUAADlxzMOyThvYhFLK52oOePFQC1V8hF9Ay5Atis=";

  # used for "Server Installed" version in admin panel
  env.VW_VERSION = version;
@@ -30,12 +30,12 @@ lib.getExe (writeShellApplication {
    VAULTWARDEN_VERSION=$(curl --silent https://api.github.com/repos/dani-garcia/vaultwarden/releases/latest | jq -r '.tag_name')
    nix-update "vaultwarden" --version "$VAULTWARDEN_VERSION"

-    URL="https://raw.githubusercontent.com/dani-garcia/vaultwarden/''${VAULTWARDEN_VERSION}/docker/DockerSettings.yaml"
-    WEBVAULT_VERSION="$(curl --silent "$URL" | yq -r ".vault_version" | sed s/^v//)"
-    old_hash="$(nix --extra-experimental-features nix-command eval -f default.nix --raw vaultwarden.webvault.bw_web_builds.outputHash)"
-    new_hash="$(nix-prefetch-git https://github.com/dani-garcia/bw_web_builds.git --rev "v$WEBVAULT_VERSION" | jq --raw-output ".sha256")"
-    new_hash_sri="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$new_hash")"
-    sed -e "s#$old_hash#$new_hash_sri#" -i pkgs/tools/security/vaultwarden/webvault.nix
-    nix-update "vaultwarden.webvault" --version "$WEBVAULT_VERSION"
+    URL_VAULTWARDEN_DOCKER_SETTINGS="https://raw.githubusercontent.com/dani-garcia/vaultwarden/''${VAULTWARDEN_VERSION}/docker/DockerSettings.yaml"
+    WEBVAULT_VERSION="$(curl --silent "$URL_VAULTWARDEN_DOCKER_SETTINGS" | yq -r ".vault_version")"
+    URL_BW_WEBVAULT_DOCKERFILE="https://raw.githubusercontent.com/dani-garcia/bw_web_builds/refs/tags/''${WEBVAULT_VERSION}/Dockerfile"
+    WEBVAULT_REV="$(curl --silent "$URL_BW_WEBVAULT_DOCKERFILE" | grep -m1 "^ARG VAULT_VERSION=" | cut -d'=' -f2)"
+    URL_VW_WEBVAULT_TAGS="https://api.github.com/repos/vaultwarden/vw_web_builds/tags"
+    WEBVAULT_TAG="$(curl --silent "$URL_VW_WEBVAULT_TAGS" | jq -r --arg rev "''${WEBVAULT_REV}" '.[] | select(.commit.sha == $rev) | .name')"
+    nix-update "vaultwarden.webvault" --version "$WEBVAULT_TAG"
  '';
 })
@@ -5,12 +5,13 @@
  fetchFromGitHub,
  nixosTests,
  python3,
+  dart-sass,
  vaultwarden,
 }:

 buildNpmPackage rec {
  pname = "vaultwarden-webvault";
-  version = "2025.7.0.0";
+  version = "2025.12.0.0";

  # doesn't build with newer versions
  nodejs = nodejs_22;
@@ -19,13 +20,14 @@ buildNpmPackage rec {
    owner = "vaultwarden";
    repo = "vw_web_builds";
    tag = "v${version}";
-    hash = "sha256-CnVOi4xE0+VFTm0yI4++MBv8w0vgtsRE5E2RwsLojMI=";
+    hash = "sha256-j31wroJKBa6pQFDTGtZBBljXVvpt8233G2oTj8oz3fo=";
  };

-  npmDepsHash = "sha256-QoZtiZpS8jVIaGKHcfKbtBrrn+RcMRvm1/oF23nPPQw=";
+  npmDepsHash = "sha256-OT9Ll+F4e/yOJVpay/zwfEHcBqRvSFOM2mtlrJ8E6fs=";

  nativeBuildInputs = [
    python3
+    dart-sass
  ];

  makeCacheWritable = true;
@@ -35,6 +37,10 @@ buildNpmPackage rec {
    npm_config_build_from_source = "true";
  };

+  preBuild = ''
+    echo "export const compilerCommand = ['dart-sass'];" > node_modules/sass-embedded/dist/lib/src/compiler-path.js
+  '';
+
  npmRebuildFlags = [
    # FIXME one of the esbuild versions fails to download @esbuild/linux-x64
    "--ignore-scripts"
@@ -7,14 +7,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "vunnel";
-  version = "0.46.1";
+  version = "0.46.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "anchore";
    repo = "vunnel";
    tag = "v${version}";
-    hash = "sha256-WRQ3CGLdnrfRboM+0S+6ausqiAcESsJcekq09wERwNI=";
+    hash = "sha256-wQ+tu6XotTN/QcemTGzeN6/pcuEb4aRJkZROQ3liY9I=";
    leaveDotGit = true;
  };

@@ -6,7 +6,7 @@
  nix-update-script,
 }:
 let
-  version = "2.16.1";
+  version = "2.17.0";
 in
 buildGoLatestModule {
  pname = "wakapi";
@@ -16,10 +16,10 @@ buildGoLatestModule {
    owner = "muety";
    repo = "wakapi";
    tag = version;
-    hash = "sha256-CmbQWOTurz2NlZq89zbjGHUnMo55sJD7N/u/etginmM=";
+    hash = "sha256-aQh1Jn718sk/Wvsjk9xFJ5NBSmsF6OOYtj22g6kwY8k=";
  };

-  vendorHash = "sha256-Rki0KPJgAFLXlVsufl4wQPWKz6Km7cbD/jF4/Zp2tdk=";
+  vendorHash = "sha256-wlpTC050EYEjA5fteaGOGVKonMNOr7Ym2uoGUj0fw/M=";

  # Not a go module required by the project, contains development utilities
  excludedPackages = [ "scripts" ];
@@ -6,6 +6,7 @@
  libspng,
  libxkbcommon,
  luajit,
+  makeWrapper,
  meson,
  ninja,
  pkg-config,
@@ -15,18 +16,19 @@
  xorg,
  xwayland,
 }:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
  pname = "waywall";
-  version = "0-unstable-2025-08-03";
+  version = "0.2025.12.20";

  src = fetchFromGitHub {
    owner = "tesselslate";
    repo = "waywall";
-    rev = "d77f51926a203b7ddfe095971e7c6c740dad0ffc";
-    hash = "sha256-ev/A5ksqmWz6hpwUIoxg2k9BwzE4BNCZO4tpXq790zo=";
+    tag = finalAttrs.version;
+    hash = "sha256-sGb/dxXBlzXBvv2IWjgwSE8WM5qB04mYATl0uhSozMQ=";
  };

  nativeBuildInputs = [
+    makeWrapper
    meson
    ninja
    pkg-config
@@ -49,6 +51,9 @@ stdenv.mkDerivation {

    install -Dm755 waywall/waywall -t $out/bin

+    wrapProgram $out/bin/waywall \
+      --prefix PATH : ${lib.makeBinPath [ xwayland ]}
+
    runHook postInstall
  '';

@@ -64,8 +69,9 @@ stdenv.mkDerivation {
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [
      monkieeboi
+      uku3lig
    ];
    platforms = lib.platforms.linux;
    mainProgram = "waywall";
  };
-}
+})
@@ -34,13 +34,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "xemu";
-  version = "0.8.121";
+  version = "0.8.129";

  src = fetchFromGitHub {
    owner = "xemu-project";
    repo = "xemu";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-H/QGGyqV9Xdpo4JR8JZgEDyzho7jxT3H5uv/T5NV95E=";
+    hash = "sha256-Y7iIODMczLFRisOPxLPsl2Ot44I8pvjflD3vI+4rIlk=";

    nativeBuildInputs = [
      git
@@ -1,5 +1,6 @@
 {
  buildPackages,
+  writeText,
  fontconfig,
  lib,
  runCommand,
@@ -13,15 +14,16 @@ in
  fontDirectories,
 }:

+let
+  fontDirsPath = writeText "font-dirs" ''
+    <!-- Font directories -->
+    ${lib.concatStringsSep "\n" (map (font: "<dir>${font}</dir>") fontDirectories)}
+  '';
+in
 runCommand "fc-cache"
  {
    preferLocalBuild = true;
    allowSubstitutes = false;
-    passAsFile = [ "fontDirs" ];
-    fontDirs = ''
-      <!-- Font directories -->
-      ${lib.concatStringsSep "\n" (map (font: "<dir>${font}</dir>") fontDirectories)}
-    '';
  }
  ''
    export FONTCONFIG_FILE=$(pwd)/fonts.conf
@@ -33,7 +35,7 @@ runCommand "fc-cache"
      <include>${fontconfig.out}/etc/fonts/fonts.conf</include>
      <cachedir>$out</cachedir>
    EOF
-    cat "$fontDirsPath" >> fonts.conf
+    cat "${fontDirsPath}" >> fonts.conf
    echo "</fontconfig>" >> fonts.conf

    # N.B.: fc-cache keys its cache entries by architecture.
@@ -27,13 +27,13 @@

 buildDunePackage (finalAttrs: {
  pname = "smtml";
-  version = "0.17.0";
+  version = "0.18.0";

  src = fetchFromGitHub {
    owner = "formalsec";
    repo = "smtml";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-IFjaZcwBiM/xA39W+FuJ87OSEvAhvhEsZ1cF2KrxrhY=";
+    hash = "sha256-s72m7N9Ovd2Vl4F+hb2MsNmnF1hFQGkf2s7TrJ9IWI8=";
  };

  nativeBuildInputs = [
@@ -15,14 +15,14 @@

 buildPythonPackage rec {
  pname = "aioamazondevices";
-  version = "11.0.0";
+  version = "11.0.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "chemelli74";
    repo = "aioamazondevices";
    tag = "v${version}";
-    hash = "sha256-uyMtQs5nLwIgG9A5peCzFjUIyjeM8VfjmicVcTLV36I=";
+    hash = "sha256-nxKWnNLmraPtMA+WZO4FOWbcbZr/HS6dhACKcFUq7D0=";
  };

  build-system = [ poetry-core ];
@@ -23,7 +23,7 @@

 buildPythonPackage rec {
  pname = "aioautomower";
-  version = "2.7.1";
+  version = "2.7.2";
  pyproject = true;

  disabled = pythonOlder "3.11";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
    owner = "Thomas55555";
    repo = "aioautomower";
    tag = "v${version}";
-    hash = "sha256-+OzCs+yNU7ni+Lua2gAhaqYdb8dQz3lhtEdhdDgvMxo=";
+    hash = "sha256-fRfcdE76BJE7GHobZU7mYmmtnN4gBxNd5KofdE0Sm0Y=";
  };

  postPatch = ''
@@ -3,28 +3,25 @@
  aiohttp,
  buildPythonPackage,
  fetchFromGitHub,
-  pythonOlder,
  setuptools,
  yarl,
 }:

 buildPythonPackage rec {
  pname = "aiotractive";
-  version = "0.6.0";
+  version = "0.7.0";
  pyproject = true;

-  disabled = pythonOlder "3.7";
-
  src = fetchFromGitHub {
    owner = "zhulik";
    repo = "aiotractive";
    tag = "v${version}";
-    hash = "sha256-QwwW/UxRgd4rco80SqQUGt0ArDNT9MXa/U/W2/dHZT0=";
+    hash = "sha256-tdeRl3fY+OPlLnh/KixdKSy6WLIH/qQR3icoUkKGeGo=";
  };

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];

-  propagatedBuildInputs = [
+  dependencies = [
    aiohttp
    yarl
  ];
@@ -35,9 +32,9 @@ buildPythonPackage rec {
  pythonImportsCheck = [ "aiotractive" ];

  meta = {
-    changelog = "https://github.com/zhulik/aiotractive/releases/tag/v${version}";
    description = "Python client for the Tractive REST API";
    homepage = "https://github.com/zhulik/aiotractive";
+    changelog = "https://github.com/zhulik/aiotractive/releases/tag/${src.tag}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ fab ];
  };
@@ -18,14 +18,14 @@

 buildPythonPackage rec {
  pname = "alexapy";
-  version = "1.29.13";
+  version = "1.29.14";
  pyproject = true;

  src = fetchFromGitLab {
    owner = "keatontaylor";
    repo = "alexapy";
    tag = "v${version}";
-    hash = "sha256-GQ4Xv/4OdBRAc9qP0qO75FtqRVX0+v5zSjVjeOYr17Q=";
+    hash = "sha256-ZbdaiPyrF7EiigFHHFEQom+LsQKITD7FO9PdUVnoDvE=";
  };

  pythonRelaxDeps = [ "aiofiles" ];
@@ -29,10 +29,10 @@ buildPythonPackage rec {

  dependencies = [
    bleak
+    dbus-fast
  ]
  ++ lib.optionals stdenv.hostPlatform.isLinux [
    bluetooth-adapters
-    dbus-fast
  ];

  nativeCheckInputs = [
@@ -358,13 +358,13 @@

 buildPythonPackage rec {
  pname = "boto3-stubs";
-  version = "1.42.17";
+  version = "1.42.18";
  pyproject = true;

  src = fetchPypi {
    pname = "boto3_stubs";
    inherit version;
-    hash = "sha256-hHVnEH1liqAUPdCQdLupy2RkUyUahvuWxf4Ss7DlBO4=";
+    hash = "sha256-iFJwsP9w9LDUS7zDp5m4AlUhQbJVErb5arnZUwWsf6M=";
  };

  build-system = [ setuptools ];
@@ -9,13 +9,13 @@

 buildPythonPackage rec {
  pname = "botocore-stubs";
-  version = "1.42.17";
+  version = "1.42.18";
  pyproject = true;

  src = fetchPypi {
    pname = "botocore_stubs";
    inherit version;
-    hash = "sha256-tYr/vJeWSMVwgiMn0DXjWSebXqDVSc6xlL55qtpVKvI=";
+    hash = "sha256-FfL3cVoh1ELB763GCHbSl3Diu4RBxhw7hquQEi+/1LU=";
  };

  nativeBuildInputs = [ setuptools ];
@@ -76,6 +76,7 @@ buildPythonPackage rec {
    "pydantic"
    "pydantic-settings"
    "pyjwt"
+    "python-dotenv"
    "regex"
    "tokenizers"
    "tomli"
@@ -36,6 +36,9 @@ buildPythonPackage rec {
    flit-core
  ];

+  pythonRemoveDeps = [
+    "tfp-nightly"
+  ];
  dependencies = [
    absl-py
    chex
@@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "dvc-data";
-  version = "3.16.12";
+  version = "3.17.0";
  pyproject = true;

  disabled = pythonOlder "3.12";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "iterative";
    repo = "dvc-data";
    tag = version;
-    hash = "sha256-eGicR+fWsgE2mSjhf/r96IBvXX4cLG/nmtt7Q2MCxkE=";
+    hash = "sha256-KDChfJ16tINpALtiisBn5t9hi3l6v03wVeMkukIecqs=";
  };

  build-system = [ setuptools-scm ];
@@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "iamdata";
-  version = "0.1.202512291";
+  version = "0.1.202512301";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "cloud-copilot";
    repo = "iam-data-python";
    tag = "v${version}";
-    hash = "sha256-mxnPrl9INy/PgSc0M9qPDTvI5vtlvpLvbity5YWqDeg=";
+    hash = "sha256-IafnDDsOVzsQsBJb5QhUuwfbVixnoBWGHTAmETslefQ=";
  };

  __darwinAllowLocalNetworking = true;
@@ -338,8 +338,8 @@ in
      "sha256-zMNP1LXKSynkfJSLn19sz5UoT8LiswD5qSZCn1y5GsA=";

  mypy-boto3-connect =
-    buildMypyBoto3Package "connect" "1.42.14"
-      "sha256-IG24SYEczO1XbjusR1zgHLGtMF3k43OXEsZKh7aShrI=";
+    buildMypyBoto3Package "connect" "1.42.18"
+      "sha256-/BfqYdUJygoVgTkDK20q72ihFPNmvrqIymzjj+48pns=";

  mypy-boto3-connect-contact-lens =
    buildMypyBoto3Package "connect-contact-lens" "1.42.3"
@@ -1073,8 +1073,8 @@ in
      "sha256-YrrEKl3aGz//5Z5JGapHhWtk6hBXQ4cuRQmLqGYztzg=";

  mypy-boto3-quicksight =
-    buildMypyBoto3Package "quicksight" "1.42.8"
-      "sha256-gzUtWuBpdWN+nRaJmsrs4EKzsTeRgiDnacEs8yG9PjQ=";
+    buildMypyBoto3Package "quicksight" "1.42.18"
+      "sha256-6gYCSoGVbd2hw/NktDiLo1QlOO23LrwlaJ3gm30gpDQ=";

  mypy-boto3-ram =
    buildMypyBoto3Package "ram" "1.42.3"
@@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "py-opensonic";
-  version = "7.0.3";
+  version = "7.0.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "khers";
    repo = "py-opensonic";
    tag = "v${version}";
-    hash = "sha256-3ull0vZxkORh7WRvXPopjLqhZ5+70RTNjqUJ9FpUPJI=";
+    hash = "sha256-5wsisIfYW+0uh0khUzt9wKFxBf/ZXVsKpNF/Dcrj2wI=";
  };

  build-system = [ setuptools ];
@@ -2,10 +2,9 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
-  fetchpatch,

  # build-system
-  setuptools,
+  flit-core,

  # dependencies
  absl-py,
@@ -15,7 +14,6 @@
  jax,
  jaxlib,
  numpy,
-  tensorflow-probability,

  # tests
  dm-haiku,
@@ -37,7 +35,7 @@ buildPythonPackage rec {
  };

  build-system = [
-    setuptools
+    flit-core
  ];

  dependencies = [
@@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "tencentcloud-sdk-python";
-  version = "3.1.21";
+  version = "3.1.22";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "TencentCloud";
    repo = "tencentcloud-sdk-python";
    tag = version;
-    hash = "sha256-wyI6lsMPMbRINs2hQ9Pn2YtruA/VilAgjKbTptTfyfg=";
+    hash = "sha256-+hrBKYO1y0gCJw9odWbUNA7t4DXuSj4Lwr189vO82fM=";
  };

  build-system = [ setuptools ];
@@ -554,12 +554,9 @@
  };

  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;
+    version = "0-unstable-2025-02-17";
+    url = "github:tris203/tree-sitter-razor/fe46ce5ea7d844e53d59bc96f2175d33691c61c5";
+    hash = "sha256-E4fgy588g6IP258TS2DvoILc1Aikvpfbtq20VIhBE4U=";
  };

  regex = {
@@ -88,6 +88,7 @@ let
    miele = getComponentDeps "cloud";
    mjpeg = getComponentDeps "camera";
    mobile_app = getComponentDeps "frontend";
+    mopeka = getComponentDeps "switchbot";
    motioneye = getComponentDeps "camera";
    mqtt = getComponentDeps "camera";
    nest = getComponentDeps "camera" ++ [
@@ -200,6 +201,13 @@ let
      # intent fixture mismatch
      "test_error_no_device_on_floor"
    ];
+    homewizard = [
+      # Messages don't match expected due to a change in Homewizard's outputs
+      "test_identify_button"
+      "test_number_entities"
+      "test_select_request_error"
+      "test_switch_entities"
+    ];
    sensor = [
      # Failed: Translation not found for sensor
      "test_validate_unit_change_convertible"
@@ -5353,15 +5353,6 @@ with pkgs;
    xeus-cling
    ;

-  clojure = callPackage ../development/interpreters/clojure {
-    # set this to an LTS version of java
-    # Be careful if you remove this, out-of-tree consumers expect to
-    # be able to override `jdk`.
-    jdk = jdk21;
-  };
-
-  clooj = callPackage ../development/interpreters/clojure/clooj.nix { };
-
  dhall = haskell.lib.compose.justStaticExecutables haskellPackages.dhall;

  dhall-bash = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-bash;