Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/libraries/mesa/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix

Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391

4 files changed, 9 insertions, 8 deletions

diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdoc.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdoc.nix
index 004a18f53c78..3bbe39e5ee20 100644
--- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdoc.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdoc.nix
@@ -13,7 +13,7 @@ qtModule {
           --replace '$QT_INSTALL_DOCS' "${qtbase}/share/doc"
     done
   '';
-  nativeBuildInputs = [ qttools ];
+  nativeBuildInputs = [ (qttools.override { withClang = true; }) ];
   qtInputs = [ qtdeclarative ];
   cmakeFlags = [
     "-DCMAKE_MESSAGE_LOG_LEVEL=STATUS"
diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
index 1cf228d4e280..43c6dade7de3 100644
--- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
@@ -5,12 +5,12 @@
 
 qtModule rec {
   pname = "qtmqtt";
-  version = "6.5.1";
+  version = "6.5.2";
   src = fetchFromGitHub {
     owner = "qt";
     repo = "qtmqtt";
     rev = "v${version}";
-    hash = "sha256-tXCLb4ZWgdPSfnlGKsKNW9kJ57cm8+d8y416O42NZvk=";
+    hash = "sha256-yyerVzz+nGT5kjNo24zYqZcJmrE50KCp38s3+samjd0=";
   };
   qtInputs = [ qtbase ];
 }
diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qttools.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qttools.nix
index 7d13e9a03e5c..adca87550cca 100644
--- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qttools.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qttools.nix
@@ -3,13 +3,15 @@
 , lib
 , qtbase
 , qtdeclarative
-, llvmPackages
 , cups
+, llvmPackages
+# clang-based c++ parser for qdoc and lupdate
+, withClang ? false
 }:
 
 qtModule {
   pname = "qttools";
-  buildInputs = [
+  buildInputs = lib.optionals withClang [
     llvmPackages.libclang
     llvmPackages.llvm
   ];
diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
index fadbc5d2bfa3..909616d953de 100644
--- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
@@ -66,7 +66,7 @@
 , xkeyboard_config
 , enableProprietaryCodecs ? true
   # darwin
-, clang_14
+, llvmPackages_14
 , bootstrap_cmds
 , cctools
 , xcbuild
@@ -113,7 +113,7 @@ qtModule {
     gn
     nodejs
   ] ++ lib.optionals stdenv.isDarwin [
-    clang_14
+    llvmPackages_14.clang
     bootstrap_cmds
     cctools
     xcbuild
@@ -309,7 +309,6 @@ qtModule {
   meta = with lib; {
     description = "A web engine based on the Chromium web browser";
     platforms = platforms.unix;
-    broken = stdenv.isDarwin && stdenv.isx86_64;
     # This build takes a long time; particularly on slow architectures
     # 1 hour on 32x3.6GHz -> maybe 12 hours on 4x2.4GHz
     timeout = 24 * 3600;