Merge staging-next into staging

There was a conflict - not complex but it wasn't auto-resolved by git:
	pkgs/development/libraries/science/math/openblas/default.nix

pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix

@@ -117,15 +117,6 @@ qtModule {
 
     # Reproducibility QTBUG-136068
     ./gn-object-sorted.patch
-  ]
-  ++ lib.optionals stdenv.cc.isClang [
-    # https://chromium-review.googlesource.com/c/chromium/src/+/6633292
-    (fetchpatch2 {
-      url = "https://github.com/chromium/chromium/commit/b0ff8c3b258a8816c05bdebf472dbba719d3c491.patch?full_index=1";
-      stripLen = 1;
-      extraPrefix = "src/3rdparty/chromium/";
-      hash = "sha256-zDIlHd8bBtrThkFnrcyA13mhXYIQt6sKsi6qAyQ34yo=";
-    })
   ];
 
   postPatch = ''

pkgs/development/libraries/science/math/openblas/default.nix

@@ -195,11 +195,12 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/OpenMathLib/OpenBLAS/commit/7086a1b075ca317e12cfe79d40a32ad342a30496.patch";
       hash = "sha256-pA3HK2f2MJr/+h/uale7edIYk/KH194EscYFcsujPXY=";
     })
-    # Backport https://github.com/OpenMathLib/OpenBLAS/pull/5710
-    # Work around miscompilation of the ARM64 non-SVE DDOT kernel
+    # This commit led to miscompilation of certain ASIMD extensions code paths.
+    # There was an attempted fix in upstream but this still leaves some scipy tests failing.
     (fetchpatch {
-      url = "https://github.com/OpenMathLib/OpenBLAS/commit/e3ce4623c299068bbd47c35ee87aab334bac73b1.patch";
-      hash = "sha256-j0zIJjNiAdIVPgdxB+pXiOrOtedDu6Yq+dgaJ/wCquk=";
+      url = "https://github.com/OpenMathLib/OpenBLAS/commit/3f6e928d34aca977bd5d4191e6d2c2338a342.patch";
+      revert = true;
+      hash = "sha256-EccgzxgyfAjVbV+HPemGHmzkRe0kpixu3eS3BZWr0g4=";
     })
   ];