diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 9c34451b9e84..dcc9226993b2 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -352,42 +352,6 @@ let qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix { }; env = callPackage ../qt-env.nix { }; - full = - callPackage ({ env, qtbase }: env "qt-full-${qtbase.version}") { } - # `with self` is ok to use here because having these spliced is unnecessary - ( - with self; - [ - qt3d - qtcharts - qtconnectivity - qtdeclarative - qtdoc - qtgraphicaleffects - qtimageformats - qtlocation - qtmultimedia - qtquickcontrols - qtquickcontrols2 - qtscript - qtsensors - qtserialport - qtsvg - qttools - qttranslations - qtvirtualkeyboard - qtwebchannel - qtwebengine - qtwebsockets - qtwebview - qtx11extras - qtxmlpatterns - qtlottie - qtdatavis3d - ] - ++ lib.optional (!stdenv.hostPlatform.isDarwin) qtwayland - ++ lib.optional (stdenv.hostPlatform.isDarwin) qtmacextras - ); qmake = callPackage ( { qtbase }: @@ -422,6 +386,9 @@ let ++ lib.optional stdenv.hostPlatform.isLinux qtwayland.dev; } ../hooks/wrap-qt-apps-hook.sh ) { }; + } + // lib.optionalAttrs config.allowAliases { + full = throw "libsForQt5.full has been removed. Please use individual packages instead."; # Added 2025-10-18 }; baseScope = makeScopeWithSplicing' { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f7633dfb2ee1..b8e4b359fbdb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2255,6 +2255,7 @@ mapAliases { qt-video-wlr = throw "'qt-video-wlr' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20 qt515 = qt5; # Added 2022-11-24 qt5ct = throw "'qt5ct' has been renamed to/replaced by 'libsForQt5.qt5ct'"; # Converted to throw 2024-10-17 + qt5Full = throw "qt5Full has been removed. Please use individual packages instead."; # Added 2025-10-18 qt6ct = qt6Packages.qt6ct; # Added 2023-03-07 qtchan = throw "'qtchan' has been removed due to lack of maintenance upstream"; # Added 2025-07-01 qtcurve = throw "'qtcurve' has been renamed to/replaced by 'libsForQt5.qtcurve'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 659b705ee86a..b583186615ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8493,7 +8493,6 @@ with pkgs; plasma5Packages = libsForQt5; qtEnv = qt5.env; - qt5Full = qt5.full; qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { });