diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix
index 9d0441dd50b3..aca810bce2bc 100644
--- a/pkgs/development/compilers/llvm/common/clang/default.nix
+++ b/pkgs/development/compilers/llvm/common/clang/default.nix
@@ -160,7 +160,11 @@ stdenv.mkDerivation (
         mv $out/bin/set-xcode-analyzer $python/bin
       fi
       mv $out/share/clang/*.py $python/share/clang
+    ''
+    + lib.optionalString (lib.versionOlder release_version "22") ''
       rm $out/bin/c-index-test
+    ''
+    + ''
       patchShebangs $python/bin
 
       mkdir -p $dev/bin
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index e592df09cb57..a80d04635331 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -27,9 +27,9 @@ let
     "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
     "21.1.2".officialRelease.sha256 = "sha256-SgZdBL0ivfv6/4EqmPQ+I57qT2t6i/rqnm20+T1BsFY=";
     "22.0.0-git".gitRelease = {
-      rev = "81c5d468cf00d6e41112fba6c89d6c40013bcbda";
-      rev-version = "22.0.0-unstable-2025-11-30";
-      sha256 = "sha256-aZdPGmj+02pQPjvIlJyn9DEKCiIHjLaethxRUa2MWHE=";
+      rev = "fc92e4dec9a6dfcb4fb77d863d0bf1dbc53033e5";
+      rev-version = "22.0.0-unstable-2025-12-07";
+      sha256 = "sha256-ntcaJgSG22tIDTBUVEwx+6ksQrWR6YHDwbUOls06JEE=";
     };
   }
   // llvmVersions;