libreoffice: drop Qt5 builds

pkgs/applications/office/libreoffice/default.nix

@@ -134,16 +134,10 @@
   withFonts ? false,
   withHelp ? true,
   kdeIntegration ? false,
-  qtbase ? null,
-  qtx11extras ? null,
-  qtwayland ? null,
-  ki18n ? null,
-  kconfig ? null,
-  kcoreaddons ? null,
-  kio ? null,
-  kwindowsystem ? null,
   variant ? "fresh",
   debugLogging ? variant == "still",
+  qt6,
+  kdePackages,
   symlinkJoin,
   libpq,
   makeFontsConf,
@@ -164,24 +158,6 @@
   lp_solve,
   xmlsec,
   libcmis,
-  # The rest are used only in passthru, for the wrapper
-  kauth ? null,
-  kcompletion ? null,
-  kconfigwidgets ? null,
-  kglobalaccel ? null,
-  kitemviews ? null,
-  knotifications ? null,
-  ktextwidgets ? null,
-  kwidgetsaddons ? null,
-  kxmlgui ? null,
-  phonon ? null,
-  qtdeclarative ? null,
-  qtmultimedia ? null,
-  qtquickcontrols ? null,
-  qtsvg ? null,
-  qttools ? null,
-  solid ? null,
-  sonnet ? null,
 }:
 
 assert builtins.elem variant [
@@ -272,8 +248,6 @@ let
     help = srcsAttributes.help { inherit fetchurl fetchgit; };
   };
 
-  qtMajor = lib.versions.major qtbase.version;
-
   # See `postPatch` for details
   kdeDeps = symlinkJoin {
     name = "libreoffice-kde-dependencies-${version}";
@@ -284,14 +258,13 @@ let
           (getLib e)
         ])
         [
-          qtbase
-          qtmultimedia
-          qtx11extras
-          kconfig
-          kcoreaddons
-          ki18n
-          kio
-          kwindowsystem
+          qt6.qtbase
+          qt6.qtmultimedia
+          kdePackages.kconfig
+          kdePackages.kcoreaddons
+          kdePackages.ki18n
+          kdePackages.kio
+          kdePackages.kwindowsystem
         ]
     );
   };
@@ -402,7 +375,7 @@ stdenv.mkDerivation (finalAttrs: {
     zip
   ]
   ++ optionals kdeIntegration [
-    qtbase
+    qt6.qtbase
   ];
 
   buildInputs =
@@ -503,10 +476,9 @@ stdenv.mkDerivation (finalAttrs: {
       zlib
     ]
     ++ optionals kdeIntegration [
-      qtbase
-      qtx11extras
-      kcoreaddons
-      kio
+      qt6.qtbase
+      kdePackages.kcoreaddons
+      kdePackages.kio
     ];
 
   preConfigure = ''
@@ -534,10 +506,10 @@ stdenv.mkDerivation (finalAttrs: {
     # The 2nd option is not very Nix'y, but I'll take robust over nice any day.
     # Additionally, it's much easier to fix if LO breaks on the next upgrade (just
     # add the missing dependencies to it).
-    export QT${qtMajor}INC=${kdeDeps}/include
-    export QT${qtMajor}LIB=${kdeDeps}/lib
-    export KF${qtMajor}INC="${kdeDeps}/include ${kdeDeps}/include/KF${qtMajor}"
-    export KF${qtMajor}LIB=${kdeDeps}/lib
+    export QT6INC=${kdeDeps}/include
+    export QT6LIB=${kdeDeps}/lib
+    export KF6INC="${kdeDeps}/include ${kdeDeps}/include/KF6"
+    export KF6LIB=${kdeDeps}/lib
   '';
 
   configureFlags = [
@@ -619,11 +591,8 @@ stdenv.mkDerivation (finalAttrs: {
     "--without-system-zxcvbn"
   ]
   ++ optionals kdeIntegration [
-    "--enable-kf${qtMajor}"
-    "--enable-qt${qtMajor}"
-  ]
-  ++ optionals (kdeIntegration && qtMajor == "5") [
-    "--enable-gtk3-kde5"
+    "--enable-kf6"
+    "--enable-qt6"
   ]
   ++ (
     if variant == "fresh" || variant == "collabora" then
@@ -657,9 +626,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildTargets = [ "build-nocheck" ];
 
-  # Disable tests for the Qt5 build, as they seem even more flaky
-  # than usual, and we will drop the Qt5 build after 24.11 anyway.
-  doCheck = !(kdeIntegration && qtMajor == "5");
+  doCheck = true;
 
   preCheck = ''
     export HOME=$(pwd)
@@ -715,7 +682,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit gtk3;
     # Although present in qtPackages, we need qtbase.qtPluginPrefix and
     # qtbase.qtQmlPrefix
-    inherit qtbase;
+    inherit (qt6) qtbase;
     gst_packages = with gst_all_1; [
       gst-libav
       gst-plugins-bad
@@ -725,35 +692,34 @@ stdenv.mkDerivation (finalAttrs: {
       gstreamer
     ];
     qmlPackages = [
-      ki18n
-      knotifications
-      qtdeclarative
-      qtmultimedia
-      qtquickcontrols
-      qtwayland
-      solid
-      sonnet
+      kdePackages.ki18n
+      kdePackages.knotifications
+      qt6.qtdeclarative
+      qt6.qtmultimedia
+      qt6.qtwayland
+      kdePackages.solid
+      kdePackages.sonnet
     ];
     qtPackages = [
-      kauth
-      kcompletion
-      kconfigwidgets
-      kglobalaccel
-      ki18n
-      kio
-      kitemviews
-      ktextwidgets
-      kwidgetsaddons
-      kwindowsystem
-      kxmlgui
-      phonon
-      qtbase
-      qtdeclarative
-      qtmultimedia
-      qtsvg
-      qttools
-      qtwayland
-      sonnet
+      kdePackages.kauth
+      kdePackages.kcompletion
+      kdePackages.kconfigwidgets
+      kdePackages.kglobalaccel
+      kdePackages.ki18n
+      kdePackages.kio
+      kdePackages.kitemviews
+      kdePackages.ktextwidgets
+      kdePackages.kwidgetsaddons
+      kdePackages.kwindowsystem
+      kdePackages.kxmlgui
+      kdePackages.phonon
+      qt6.qtbase
+      qt6.qtdeclarative
+      qt6.qtmultimedia
+      qt6.qtsvg
+      qt6.qttools
+      qt6.qtwayland
+      kdePackages.sonnet
     ];
   };
 

pkgs/top-level/aliases.nix

@@ -1325,6 +1325,12 @@ mapAliases {
   LibreArp-lv2 = librearp-lv2; # Added 2024-06-12
   libreddit = throw "'libreddit' has been removed because it is unmaintained upstream. Consider using 'redlib', a maintained fork"; # Added 2024-07-17
   librtlsdr = rtl-sdr; # Added 2023-02-18
+  libreoffice-qt6 = libreoffice-qt; # Added 2025-08-30
+  libreoffice-qt6-unwrapped = libreoffice-qt.unwrapped; # Added 2025-08-30
+  libreoffice-qt6-fresh = libreoffice-qt-fresh; # Added 2025-08-30
+  libreoffice-qt6-fresh-unwrapped = libreoffice-qt-fresh.unwrapped; # Added 2025-08-30
+  libreoffice-qt6-still = libreoffice-qt-still; # Added 2025-08-30
+  libreoffice-qt6-still-unwrapped = libreoffice-qt-still.unwrapped; # Added 2025-08-30
   librewolf-wayland = librewolf; # Added 2022-11-15
   libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2024-10-17
   libsForQt515 = libsForQt5; # Added 2022-11-24

pkgs/top-level/all-packages.nix

@@ -12249,7 +12249,7 @@ with pkgs;
 
   libreoffice-qt-fresh = lowPrio (
     callPackage ../applications/office/libreoffice/wrapper.nix {
-      unwrapped = libsForQt5.callPackage ../applications/office/libreoffice {
+      unwrapped = kdePackages.callPackage ../applications/office/libreoffice {
         kdeIntegration = true;
         variant = "fresh";
       };
@@ -12259,7 +12259,7 @@ with pkgs;
 
   libreoffice-qt-still = lowPrio (
     callPackage ../applications/office/libreoffice/wrapper.nix {
-      unwrapped = libsForQt5.callPackage ../applications/office/libreoffice {
+      unwrapped = kdePackages.callPackage ../applications/office/libreoffice {
         kdeIntegration = true;
         variant = "still";
       };
@@ -12267,29 +12267,6 @@ with pkgs;
   );
   libreoffice-qt-still-unwrapped = libreoffice-qt-still.unwrapped;
 
-  libreoffice-qt6 = hiPrio libreoffice-qt6-still;
-  libreoffice-qt6-unwrapped = libreoffice-qt6.unwrapped;
-
-  libreoffice-qt6-fresh = lowPrio (
-    callPackage ../applications/office/libreoffice/wrapper.nix {
-      unwrapped = kdePackages.callPackage ../applications/office/libreoffice {
-        kdeIntegration = true;
-        variant = "fresh";
-      };
-    }
-  );
-  libreoffice-qt6-fresh-unwrapped = libreoffice-qt6-fresh.unwrapped;
-
-  libreoffice-qt6-still = lowPrio (
-    callPackage ../applications/office/libreoffice/wrapper.nix {
-      unwrapped = kdePackages.callPackage ../applications/office/libreoffice {
-        kdeIntegration = true;
-        variant = "still";
-      };
-    }
-  );
-  libreoffice-qt6-still-unwrapped = libreoffice-qt-still.unwrapped;
-
   libreoffice-fresh = lowPrio (
     callPackage ../applications/office/libreoffice/wrapper.nix {
       unwrapped = callPackage ../applications/office/libreoffice {