Merge master into staging-next

.github/workflows/eval.yml

@@ -32,12 +32,11 @@ jobs:
     outputs:
       targetRunId: ${{ steps.targetRunId.outputs.targetRunId }}
     steps:
-      - name: Enable swap
+      # We'd rather fail than run slow eval on swap.
+      # Failing allows us to adjust the chunkSize to remain fast.
+      - name: Disable swap
         run: |
-          sudo fallocate -l 10G /swap
-          sudo chmod 600 /swap
-          sudo mkswap /swap
-          sudo swapon /swap
+          sudo swapoff -a
 
       - name: Check out the PR at the test merge commit
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -56,7 +55,7 @@ jobs:
         run: |
           nix-build untrusted/ci -A eval.singleSystem \
             --argstr evalSystem "$MATRIX_SYSTEM" \
-            --arg chunkSize 10000 \
+            --arg chunkSize 8000 \
             --out-link merged
           # If it uses too much memory, slightly decrease chunkSize
 

nixos/modules/image/repart-verity-store.nix

@@ -140,8 +140,8 @@ in
           pkgs.runCommand ukiFile
             {
               nativeBuildInputs = [
-                pkgs.jq
-                pkgs.systemdUkify
+                pkgs.buildPackages.jq
+                pkgs.buildPackages.systemdUkify
               ];
             }
             ''
@@ -177,9 +177,9 @@ in
               };
 
               nativeBuildInputs = previousAttrs.nativeBuildInputs ++ [
-                pkgs.systemdUkify
+                pkgs.buildPackages.systemdUkify
                 verityHashCheck
-                pkgs.jq
+                pkgs.buildPackages.jq
               ];
 
               preBuild = ''

nixos/modules/services/misc/open-webui.nix

@@ -89,10 +89,10 @@ in
       after = [ "network.target" ];
 
       environment = {
-        STATIC_DIR = ".";
-        DATA_DIR = ".";
-        HF_HOME = ".";
-        SENTENCE_TRANSFORMERS_HOME = ".";
+        STATIC_DIR = "${cfg.stateDir}/static";
+        DATA_DIR = "${cfg.stateDir}/data";
+        HF_HOME = "${cfg.stateDir}/hf_home";
+        SENTENCE_TRANSFORMERS_HOME = "${cfg.stateDir}/transformers_home";
         WEBUI_URL = "http://localhost:${toString cfg.port}";
       }
       // cfg.environment;

pkgs/applications/editors/jetbrains/bin/versions.json

@@ -11,18 +11,18 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
-      "version": "2025.1.4",
-      "sha256": "8d90be9d11c0f47b380f4a9f705058215817edf043bdcea2223d788d25193f78",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.1.4.tar.gz",
-      "build_number": "251.27812.15"
+      "version": "2025.2",
+      "sha256": "a12d094544f0b5222d34e2cd8b36b1ea834e7c7acdea7b65aae5cb3522ca108e",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.tar.gz",
+      "build_number": "252.23892.426"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
       "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
-      "version": "2025.2",
-      "sha256": "5c44d4cb3e323f6913ef09a50b13028f92a7db6809b08a26763929555186df31",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.tar.gz",
-      "build_number": "252.23892.363"
+      "version": "2025.2.1",
+      "sha256": "1a0dea8a82920818e40b552950e90caf39bcf6ca9ae4e973a1d49e7db0498ecc",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.1.tar.gz",
+      "build_number": "252.23892.464"
     },
     "dataspell": {
       "update-channel": "DataSpell RELEASE",
@@ -43,10 +43,10 @@
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
-      "version": "2025.1.4",
-      "sha256": "42efe9cc97248403e868180339f403ab390e9a335a658bd7aa905b64c03c7a31",
-      "url": "https://download.jetbrains.com/go/goland-2025.1.4.tar.gz",
-      "build_number": "251.27812.54"
+      "version": "2025.2",
+      "sha256": "d285c10055af9002db8c913557535ba46e3158c5733b236add3d71f93873e85a",
+      "url": "https://download.jetbrains.com/go/goland-2025.2.tar.gz",
+      "build_number": "252.23892.449"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
@@ -75,10 +75,10 @@
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
-      "version": "2025.1.4.1",
-      "sha256": "92cd8d570d0307188190761c7cd0d0f77351ff119735073c2a101e4a364292b4",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.4.1.tar.gz",
-      "build_number": "251.27812.52",
+      "version": "2025.2",
+      "sha256": "d0d3e61aaed7c4765b4947a8410a885cf7e1123c488340585ed72151f8c05350",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.tar.gz",
+      "build_number": "252.23892.419",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
@@ -116,10 +116,10 @@
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
-      "version": "2025.1.5",
-      "sha256": "54eda433719c132c48e733b659b29113d362fea3b9c7dd4109497ed31da7c6f6",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.5.tar.gz",
-      "build_number": "251.26927.79"
+      "version": "2025.2",
+      "sha256": "98bf8781c9325d3c4ddd6b0f4efb934b209f2afcbf97533effd2e8ffe40800e0",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.tar.gz",
+      "build_number": "252.23892.452"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
@@ -150,18 +150,18 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
-      "version": "2025.1.4",
-      "sha256": "0864c25fe8bb442b3891e51382de177ff5543bf075bbd1c12767984695f2dcaa",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.1.4-aarch64.tar.gz",
-      "build_number": "251.27812.15"
+      "version": "2025.2",
+      "sha256": "a594949bd15a70dd17906d056778b8107a209e0bc874a188b411da8e8f7e4f16",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.2-aarch64.tar.gz",
+      "build_number": "252.23892.426"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
       "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz",
-      "version": "2025.2",
-      "sha256": "fb358605d813007eea7e010cf642a822f04eea60d5808865d153429b4d5784dd",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2-aarch64.tar.gz",
-      "build_number": "252.23892.363"
+      "version": "2025.2.1",
+      "sha256": "da21f165bce024ed6e99275350da41fa49e8ac51a47da50ed7a1e104edc06aa0",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.1-aarch64.tar.gz",
+      "build_number": "252.23892.464"
     },
     "dataspell": {
       "update-channel": "DataSpell RELEASE",
@@ -182,10 +182,10 @@
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz",
-      "version": "2025.1.4",
-      "sha256": "4c24dddd6babfc36d70b0287bf32857d2c01c61d3ef1d2579a29f741c71fdad0",
-      "url": "https://download.jetbrains.com/go/goland-2025.1.4-aarch64.tar.gz",
-      "build_number": "251.27812.54"
+      "version": "2025.2",
+      "sha256": "99a5f3e0455fddf62ce92644cb53906e4600da6d2d2dad89164c594c31faa157",
+      "url": "https://download.jetbrains.com/go/goland-2025.2-aarch64.tar.gz",
+      "build_number": "252.23892.449"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
@@ -214,10 +214,10 @@
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
-      "version": "2025.1.4.1",
-      "sha256": "3e06d34ec4a49faa88492e1d6fda8fc53c8e2d01839e553024b6b4e38e2ab9cf",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.4.1-aarch64.tar.gz",
-      "build_number": "251.27812.52",
+      "version": "2025.2",
+      "sha256": "06821ba75ce5dd5f192246befd5aedfc236606d8c4a1a2c15bf3d21a39c6cf04",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2-aarch64.tar.gz",
+      "build_number": "252.23892.419",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
@@ -255,10 +255,10 @@
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
-      "version": "2025.1.5",
-      "sha256": "9c53be6d814983852e39081db69a0ec337fd7dad77f4278fbbfd246d43f7d3e4",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.5-aarch64.tar.gz",
-      "build_number": "251.26927.79"
+      "version": "2025.2",
+      "sha256": "aeb1876b94904056994b8735c4e9b35b2579daea843347ae04eaf9634bb71370",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2-aarch64.tar.gz",
+      "build_number": "252.23892.452"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
@@ -289,18 +289,18 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
-      "version": "2025.1.4",
-      "sha256": "73076ec3803acaf61feb0181d60a0a4a13ff33b09997995f4a57b9dc37a175ac",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.1.4.dmg",
-      "build_number": "251.27812.15"
+      "version": "2025.2",
+      "sha256": "7fb1e9149b29e9794af5975715f14c65b856358ea64161eddb81a80e576158cf",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.dmg",
+      "build_number": "252.23892.426"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
       "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
-      "version": "2025.2",
-      "sha256": "241a87b39b88b1e6e03ee3296f7839807ae926cc5bef9d1783bbab17d5951299",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.dmg",
-      "build_number": "252.23892.363"
+      "version": "2025.2.1",
+      "sha256": "e6c7fd2777ec7f621fa08b6d2d599c84b765d94be9d2b7a62f840ea6253cb9fe",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.1.dmg",
+      "build_number": "252.23892.464"
     },
     "dataspell": {
       "update-channel": "DataSpell RELEASE",
@@ -321,10 +321,10 @@
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
-      "version": "2025.1.4",
-      "sha256": "4b9ec3bf0cf040dd076b028f68f91815664cfdd11f51c68c54a60cbf1df3af25",
-      "url": "https://download.jetbrains.com/go/goland-2025.1.4.dmg",
-      "build_number": "251.27812.54"
+      "version": "2025.2",
+      "sha256": "c42e150a88b9d9ef033a7ff3678eb891408668afe83179d4f678bb674dc8e424",
+      "url": "https://download.jetbrains.com/go/goland-2025.2.dmg",
+      "build_number": "252.23892.449"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
@@ -353,10 +353,10 @@
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
-      "version": "2025.1.4.1",
-      "sha256": "ce91ad25859ce7081c2181468aa57fef76e4f394049cb90da5ab69f34d9d9209",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.4.1.dmg",
-      "build_number": "251.27812.52",
+      "version": "2025.2",
+      "sha256": "2a28e39d10e6470c25839698a160eb0076fb5f8a1e0e3cb9000876d05ab0d502",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.dmg",
+      "build_number": "252.23892.419",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
@@ -394,10 +394,10 @@
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
-      "version": "2025.1.5",
-      "sha256": "320183fdab31207bf56396e97ba4c15549feec71885f5f390a70a1c1cd81ecc7",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.5.dmg",
-      "build_number": "251.26927.79"
+      "version": "2025.2",
+      "sha256": "c0f19ea5e9c7cb27f80312d0eb8c7f7c3b294a0bf583b0a423930827f3cd73c5",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.dmg",
+      "build_number": "252.23892.452"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
@@ -428,18 +428,18 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
-      "version": "2025.1.4",
-      "sha256": "85e0f764787a3d910d92f3f61ea4b6b3ff46712c674154adbccafc45640e1ff2",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.1.4-aarch64.dmg",
-      "build_number": "251.27812.15"
+      "version": "2025.2",
+      "sha256": "40be28243da1bdb90308e997656af5872103a32d167e1539dd4e1b00a7ce0ea4",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.2-aarch64.dmg",
+      "build_number": "252.23892.426"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
       "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
-      "version": "2025.2",
-      "sha256": "86a4851e0ab9a74bb1c12c829752dc04b1e15b1ba668f7712ea6a0ecb5be058b",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2-aarch64.dmg",
-      "build_number": "252.23892.363"
+      "version": "2025.2.1",
+      "sha256": "865a887cc89076eac601bc073e74d6cb1b5711aaf8f4c39a2f7bd18648d9cc6e",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.1-aarch64.dmg",
+      "build_number": "252.23892.464"
     },
     "dataspell": {
       "update-channel": "DataSpell RELEASE",
@@ -460,10 +460,10 @@
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
-      "version": "2025.1.4",
-      "sha256": "3a49552e2c3a0a08b1758f9ab7ad2b119ca3fd1b5067b2432ac438537f53d5c8",
-      "url": "https://download.jetbrains.com/go/goland-2025.1.4-aarch64.dmg",
-      "build_number": "251.27812.54"
+      "version": "2025.2",
+      "sha256": "043600466d739338b9d24a472547b3d7133505165032459e9fe6f913b6920eac",
+      "url": "https://download.jetbrains.com/go/goland-2025.2-aarch64.dmg",
+      "build_number": "252.23892.449"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
@@ -492,10 +492,10 @@
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
-      "version": "2025.1.4.1",
-      "sha256": "69dbad250e42863c3b3bf724734d4428ff148c73cab39f8faf946ae44f9437a3",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.4.1-aarch64.dmg",
-      "build_number": "251.27812.52",
+      "version": "2025.2",
+      "sha256": "d4ca651a534dfa72d6c6221c23a49bb4bf10a533013db71d51096bb380f1a9c0",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2-aarch64.dmg",
+      "build_number": "252.23892.419",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
@@ -533,10 +533,10 @@
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg",
-      "version": "2025.1.5",
-      "sha256": "9386f41063a209d4634098bc14e8e63d3cf030b3f8b83524b61d99bf992905d1",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.5-aarch64.dmg",
-      "build_number": "251.26927.79"
+      "version": "2025.2",
+      "sha256": "dd0681951c4a8f2a4b97480f37f29c688ff8c7572d96d2417c4bdac1988d17f6",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2-aarch64.dmg",
+      "build_number": "252.23892.452"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",

pkgs/applications/editors/vim/plugins/generated.nix

@@ -3950,6 +3950,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  demicolon-nvim = buildVimPlugin {
+    pname = "demicolon.nvim";
+    version = "2025-04-25";
+    src = fetchFromGitHub {
+      owner = "mawkler";
+      repo = "demicolon.nvim";
+      rev = "8d79e527dbbef9de06405a30258b8d752c0638c4";
+      sha256 = "1mcn8pidpnh0fhyigzc4y4a349lgarry082y2nx39qzm2pvw0g2i";
+    };
+    meta.homepage = "https://github.com/mawkler/demicolon.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   denite-extra = buildVimPlugin {
     pname = "denite-extra";
     version = "2019-03-29";

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -1006,6 +1006,13 @@ in
     dependencies = [ self.nvim-yarp ];
   };
 
+  demicolon-nvim = super.demicolon-nvim.overrideAttrs {
+    dependencies = with self; [
+      nvim-treesitter
+      nvim-treesitter-textobjects
+    ];
+  };
+
   denops-vim = super.denops-vim.overrideAttrs {
     postPatch = ''
       # Use Nix's Deno instead of an arbitrary install

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -302,6 +302,7 @@ https://github.com/kristijanhusak/defx-git/,,
 https://github.com/kristijanhusak/defx-icons/,,
 https://github.com/Shougo/defx.nvim/,,
 https://github.com/Raimondi/delimitMate/,,
+https://github.com/mawkler/demicolon.nvim/,HEAD,
 https://github.com/neoclide/denite-extra/,,
 https://github.com/neoclide/denite-git/,,
 https://github.com/Shougo/denite.nvim/,,

pkgs/by-name/bl/blockbench/package.nix

@@ -12,13 +12,13 @@
 
 buildNpmPackage rec {
   pname = "blockbench";
-  version = "4.12.5";
+  version = "4.12.6";
 
   src = fetchFromGitHub {
     owner = "JannisX11";
     repo = "blockbench";
     tag = "v${version}";
-    hash = "sha256-u8NjwEsy3vimcvwtsUANckEx0Uz4vJLAiuUmN5lm5eQ=";
+    hash = "sha256-iV8qpUsUnL1n6hKADegNTmrW/AUWNiiNLxrTU4WPR30=";
   };
 
   nativeBuildInputs = [
@@ -29,7 +29,7 @@ buildNpmPackage rec {
     copyDesktopItems
   ];
 
-  npmDepsHash = "sha256-WiBQpd8Qlw5QTXh3kB2dG4dGZ1zfpYst5MgfHoK8UU4=";
+  npmDepsHash = "sha256-ZLFmcK91SrUM+ouBENzc+MdNvQCRDh0ej4tf2TneUtQ=";
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
 

pkgs/by-name/cl/clouddrive2/package.nix

@@ -11,16 +11,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clouddrive2";
-  version = "0.9.1";
+  version = "0.9.4";
 
   src = fetchurl {
     url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
     hash =
       {
-        x86_64-linux = "sha256-xm2kjCtfNvbZmVfd42UX+i4G44fqQsLP4V1iTCdm3PA=";
-        aarch64-linux = "sha256-HMzuRCSVBxwyuRxD23+Yk7bTrayDHi6X0JSvaGZJfvU=";
-        x86_64-darwin = "sha256-hIFCNtSFqjRCtx0/XHl7w5xeHSGrdXiKWLfq68J9GGU=";
-        aarch64-darwin = "sha256-CfATmkbXOlz7fGDGIMPQDAdcY6bxmOq1tcIsQbFGrwQ=";
+        x86_64-linux = "sha256-i6+YoZfCFaVcF7XO7wPo8AEpU0LrD4bcsIqLNz/V3aM=";
+        aarch64-linux = "sha256-BV+47uJnvH/Gapz7dACnXIM49x7u/MTdbXiFRGq2DVc=";
+        x86_64-darwin = "sha256-Jjsdx203akCmlveGZD1x8fO6V0N5d3AzGAFIAzgOkHs=";
+        aarch64-darwin = "sha256-DuSZoXTQyfC3CIwNGTsGuQNP410rK9qMBei5T7TZN7A=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };

pkgs/by-name/cn/cnspec/package.nix

@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "11.64.0";
+  version = "11.66.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${version}";
-    hash = "sha256-AJ7aw21UyvOGCLEnhTHPklyDWkBAnK/Vhvvg4UDOoH4=";
+    hash = "sha256-almzd4ZVH5iu57iEXqQYUJVo9FaToptlfdrCEfjx/bU=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-nmHs5ZHULENCyW+3giyPTO+pzbnGgGwFuVqgIfuCQi4=";
+  vendorHash = "sha256-7UiTjR75sfoFq/kKPCkyhm7NnKZZ3hKBziOzkS6MsfQ=";
 
   subPackages = [ "apps/cnspec" ];
 

pkgs/by-name/en/enum4linux-ng/package.nix

@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "enum4linux-ng";
-  version = "1.3.4";
+  version = "1.3.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cddmp";
     repo = "enum4linux-ng";
     tag = "v${version}";
-    hash = "sha256-MN3AUubro9CHkdPe/X1xcE11ye/D/A+Kf6zUOJTN4l0=";
+    hash = "sha256-jwwBYpzMjaVVojMB1udkinNQDiOXPKWbOwIsWHlhWw4=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];
@@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec {
       enumerating information from Windows and Samba systems.
     '';
     homepage = "https://github.com/cddmp/enum4linux-ng";
-    changelog = "https://github.com/cddmp/enum4linux-ng/releases/tag/v${version}";
+    changelog = "https://github.com/cddmp/enum4linux-ng/releases/tag/${src.tag}";
     license = with lib.licenses; [ gpl3Plus ];
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "enum4linux-ng";

pkgs/by-name/fl/flyctl/package.nix

@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.3.161";
+  version = "0.3.164";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-ctE8X3vyNqbdYQuDrmCLmwy/EMGpJFRnlcjxnRji1Zo=";
+    hash = "sha256-pAWdyKBiDr1opIO9P0+4Fm2wwZXaL5Nt0YJiuB+mWHo=";
   };
 
-  vendorHash = "sha256-OwxzdLXNPiQRq6mgvZaOs8tnNZQm0mYyzyPFUYcokb0=";
+  vendorHash = "sha256-l4EAOQeDLU+J7suKLzg+UAxrKGxoCpoPvQtj62u5VHE=";
 
   subPackages = [ "." ];
 

pkgs/by-name/ga/gate/package.nix

@@ -6,7 +6,7 @@
 
 let
   pname = "gate";
-  version = "0.51.0";
+  version = "0.52.0";
 in
 buildGoModule {
   inherit pname version;
@@ -15,10 +15,10 @@ buildGoModule {
     owner = "minekube";
     repo = "gate";
     tag = "v${version}";
-    hash = "sha256-Fe02QzD9ZtYT+pakWWjwM48dqe7SeF011/FafbvGc0E=";
+    hash = "sha256-DKnJnhfO3Cs80tAYiodxf1alfO4DXNneiqDILgP+v8w=";
   };
 
-  vendorHash = "sha256-d/D1l+/viJ5OFSpUDpC+4pnDwPJDBuYDjS7niao5D9U=";
+  vendorHash = "sha256-0NcfuCZHR4QHbMNqc+ilPouie+9k7FqOG/JdNX8uO8c=";
 
   ldflags = [
     "-s"

pkgs/by-name/gi/github-runner/package.nix

@@ -25,13 +25,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes;
 
 buildDotnetModule (finalAttrs: {
   pname = "github-runner";
-  version = "2.326.0";
+  version = "2.327.1";
 
   src = fetchFromGitHub {
     owner = "actions";
     repo = "runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bKOxTV6iAvC+QOsfSs1hTS9k/Ou+YGEwTr5hew23cLY=";
+    hash = "sha256-wTbhuBg9eIq1wGifeORTUvp9+yWDHb42J88o2Fmnrfo=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git-revision

pkgs/by-name/na/namespace-cli/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "namespace-cli";
-  version = "0.0.433";
+  version = "0.0.434";
 
   src = fetchFromGitHub {
     owner = "namespacelabs";
     repo = "foundation";
     rev = "v${version}";
-    hash = "sha256-ZkRo6tPYJk3ym7LDkucnoLTbmCRJ7nup4zB/7wY6dTc=";
+    hash = "sha256-D12HbOIpnzVNj5UuYlHD1nMrPZjRv+rtMQVl7WoHapc=";
   };
 
-  vendorHash = "sha256-/JFiCflhJsu8Tkkw0Pqj0iOauVXXLaNuPRK524YVN98=";
+  vendorHash = "sha256-V34JXfFFoN9rPT8NZLVh9GETq1yK8/ja5yJwp8gZ/H0=";
 
   subPackages = [
     "cmd/nsc"

pkgs/by-name/sk/sketchybar-app-font/package.nix

@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sketchybar-app-font";
-  version = "2.0.39";
+  version = "2.0.40";
 
   src = fetchFromGitHub {
     owner = "kvndrsslr";
     repo = "sketchybar-app-font";
-    rev = "v2.0.39";
-    hash = "sha256-TTkw/LhRnqJYBn6Mt+T3qgyLHhLIyACdUoShq/mIONY=";
+    rev = "v2.0.40";
+    hash = "sha256-2tvGCUqRHXWX3As9Cm+2YXd7Iwm/EoxymZ5g1CysD6E=";
   };
 
   pnpmDeps = pnpm_9.fetchDeps {

pkgs/by-name/wd/wdt/package.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation {
   pname = "wdt";
-  version = "1.27.1612021-unstable-2025-07-23";
+  version = "1.27.1612021-unstable-2025-08-01";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "wdt";
-    rev = "9294400cb0f5f7a0eef7fdf009cc01f00a5917c1";
-    sha256 = "sha256-uDsHdha8JA2oue/SBej4lYFWEtaKcsVeNBhtZZBEPZI=";
+    rev = "2852c67464dea03b6ab737c8608f86bc16d563ca";
+    sha256 = "sha256-2eD9i9i7JZQ16/Hf5WeUZ4rHxxwuGViotfEFrLWbcA4=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/by-name/xd/xdg-desktop-portal-termfilechooser/package.nix

@@ -13,13 +13,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal-termfilechooser";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "hunkyburrito";
     repo = "xdg-desktop-portal-termfilechooser";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aqFaf87f0Th9MRzLthCnTuw41R2B5z0hx7dAaZ/KEWo=";
+    hash = "sha256-3w6O9Su9COz5dKM8O8wGhSPJ4Cdb9nCU8oIBvuC6qC4=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/yo/your_spotify/package.nix

@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "your_spotify_server";
-  version = "1.13.1";
+  version = "1.14.0";
 
   src = fetchFromGitHub {
     owner = "Yooooomi";
     repo = "your_spotify";
     tag = finalAttrs.version;
-    hash = "sha256-Acf+y8/Aga6rKwdb9b6im58IWqiKX4wHDeUzT5ApPqs=";
+    hash = "sha256-yz+IVrvnNt67TQCNNqpS+jSAEevsi+0cVGBTZNMcZbk=";
   };
 
   offlineCache = fetchYarnDeps {

pkgs/development/python-modules/knx-frontend/default.nix

@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "knx-frontend";
-  version = "2025.7.23.50952";
+  version = "2025.8.6.52906";
   pyproject = true;
 
   # TODO: source build, uses yarn.lock
   src = fetchPypi {
     pname = "knx_frontend";
     inherit version;
-    hash = "sha256-LcYUXJ5K9jl3h7Jbdi/zVVZEMKcQiMz7O+IpBvgvqV0=";
+    hash = "sha256-Wmiwj5PL68VH1j5xDhZJyAHBakoG+0SKzCJCcCntT18=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/london-tube-status/default.nix

@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  aiohttp,
+  pytestCheckHook,
+  requests-mock,
+}:
+
+buildPythonPackage rec {
+  pname = "london-tube-status";
+  version = "0.6.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "robmarkcole";
+    repo = "London-tube-status";
+    tag = version;
+    hash = "sha256-bdkGDVWcyJXH21qGrdJnSa4IW2kJskFTJ5ye6M6eOz4=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    aiohttp
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    requests-mock
+  ];
+
+  # Tests are currently broken
+  # https://github.com/robmarkcole/London-tube-status/issues/7
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "london_tube_status"
+  ];
+
+  meta = {
+    description = "Parse London tube data from TFL into a dictionary";
+    homepage = "https://github.com/robmarkcole/London-tube-status";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}

pkgs/development/python-modules/mitogen/default.nix

@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "mitogen";
-  version = "0.3.24";
+  version = "0.3.26";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "mitogen-hq";
     repo = "mitogen";
     tag = "v${version}";
-    hash = "sha256-TogWhsKnwF4uHOhCNxPpNiyWen3Vfh5bbDI8wKprP/k=";
+    hash = "sha256-FP8BRiim6be4h+UYIyXR3fSw/bpLcSP6vUdnRruNVLU=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/model-checker/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "model-checker";
-  version = "0.9.31";
+  version = "0.9.35";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "model_checker";
     inherit version;
-    hash = "sha256-mg964kVjZD4XnfDV93sC1NRhThnI8mlYQ3iYBzB92IU=";
+    hash = "sha256-1O2b6wm1vRoaZfOl+Cl+aFlYtb8WTyHsVgQzPhFgNe8=";
   };
 
   # z3 does not provide a dist-info, so python-runtime-deps-check will fail

pkgs/development/python-modules/msgraph-sdk/default.nix

@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "msgraph-sdk";
-  version = "1.39.0";
+  version = "1.40.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoftgraph";
     repo = "msgraph-sdk-python";
     tag = "v${version}";
-    hash = "sha256-cT87lI28K7z4nSD35vqfroAtnZD/A0ECTNVz5vIG8R4=";
+    hash = "sha256-qoQbYSFL96ovKKZ3KJAeTtwNRJxHjnmGDbSAZ4lTVNw=";
   };
 
   build-system = [ flit-core ];

pkgs/development/python-modules/pyswitchbot/default.nix

@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pyswitchbot";
-  version = "0.68.2";
+  version = "0.68.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pySwitchbot";
     tag = version;
-    hash = "sha256-+YLLxLfDwj7bE6cHPFvkYFoQWSjbHeYfTk4rEHWHrk0=";
+    hash = "sha256-PMwXaOIEUuJcZ8D7xuOfwTqYStqynu30wS0wWHyc2WI=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix

@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "snakemake-interface-report-plugins";
-  version = "1.1.1";
+  version = "1.2.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-interface-report-plugins";
     tag = "v${version}";
-    hash = "sha256-PSybPYo7soq7GHY7mo9q0yGxoFX2pvVeAXgRsa6oXoo=";
+    hash = "sha256-wyDJa8Pahe+ANSNqZ1BZRmljpabyXhLodMJhupjd3pY=";
   };
 
   nativeBuildInputs = [ poetry-core ];

pkgs/development/python-modules/yalexs/default.nix

@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "yalexs";
-  version = "8.11.0";
+  version = "8.11.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = "yalexs";
     tag = "v${version}";
-    hash = "sha256-ajKe0pIUV2xwFi49MR4NK19G1DZ84e6oSJQIGlXq+Vo=";
+    hash = "sha256-J7fVj3vb6cLfjijEHJwWS+LmWGM74HoFs392+apdlrc=";
   };
 
   build-system = [ poetry-core ];
@@ -70,7 +70,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python API for Yale Access (formerly August) Smart Lock and Doorbell";
     homepage = "https://github.com/bdraco/yalexs";
-    changelog = "https://github.com/bdraco/yalexs/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/bdraco/yalexs/blob/${src.tag}/CHANGELOG.md";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

pkgs/servers/home-assistant/component-packages.nix

@@ -3323,7 +3323,8 @@
       ];
     "london_underground" =
       ps: with ps; [
-      ]; # missing inputs: london-tube-status
+        london-tube-status
+      ];
     "lookin" =
       ps: with ps; [
         aiolookin
@@ -7273,6 +7274,7 @@
     "logentries"
     "logger"
     "london_air"
+    "london_underground"
     "lookin"
     "loqed"
     "lovelace"

pkgs/top-level/all-packages.nix

@@ -119,7 +119,7 @@ with pkgs;
     You should not evaluate entire Nixpkgs without measures to handle failing packages.
   '';
 
-  tests = callPackages ../test { };
+  tests = lib.recurseIntoAttrs (callPackages ../test { });
 
   defaultPkgConfigPackages =
     # We don't want nix-env -q to enter this, because all of these are aliases.

pkgs/top-level/packages-config.nix

@@ -43,5 +43,8 @@
       # show up in search results or repository tracking services that consume our
       # packages.json https://github.com/NixOS/nixpkgs/issues/244966
       minimal-bootstrap = { };
+
+      # This makes it so that tests are not appering on search.nixos.org
+      tests = { };
     };
 }

pkgs/top-level/python-packages.nix

@@ -8663,6 +8663,8 @@ self: super: with self; {
 
   lomond = callPackage ../development/python-modules/lomond { };
 
+  london-tube-status = callPackage ../development/python-modules/london-tube-status { };
+
   loompy = callPackage ../development/python-modules/loompy { };
 
   loopy = callPackage ../development/python-modules/loopy { };

pkgs/top-level/release.nix

@@ -419,8 +419,6 @@ let
           "aarch64-linux"
         ];
 
-        tests = packagePlatforms pkgs.tests;
-
         # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66
 
         #emacsPackages = packagePlatforms pkgs.emacsPackages;