From f3d874fb9d2240ecacdfd6e2ce75cd442243a04e Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 21 Oct 2025 12:49:41 +0300 Subject: [PATCH] qt6.full: drop --- doc/release-notes/rl-2511.section.md | 2 + pkgs/development/libraries/qt-6/default.nix | 55 ++------------------- 2 files changed, 5 insertions(+), 52 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 579a03c4ec14..81389bf97a8b 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -242,6 +242,8 @@ - `mariadb` now defaults to `mariadb_114` instead of `mariadb_1011`, meaning the default version was upgraded from 10.11.x to 11.4.x. See the [upgrade notes](https://mariadb.com/kb/en/upgrading-from-mariadb-10-11-to-mariadb-11-4/) for potential issues. +- `qt5.full` and `qt6.full` aliases have been removed. Their use has always been discouraged, and downstream projects should use `qtN.env` with the right set of packages. + - `python3Packages.duckduckgo-search` has been updated to v9+ and therefore has been renamed to ddgs. Use `python3Packages.ddgs` instead. See [release note for v9.0.0](https://github.com/deedy5/ddgs/releases/tag/v9.0.0) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index e24c2c825240..2236001ad901 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -67,58 +67,6 @@ let inherit (srcs.qtbase) src version; }; 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 - qt5compat - qtcharts - qtconnectivity - qtdatavis3d - qtdeclarative - qtdoc - qtgraphs - qtgrpc - qthttpserver - qtimageformats - qtlanguageserver - qtlocation - qtlottie - qtmultimedia - qtmqtt - qtnetworkauth - qtpositioning - qtsensors - qtserialbus - qtserialport - qtshadertools - qtspeech - qtquick3d - qtquick3dphysics - qtquickeffectmaker - qtquicktimeline - qtremoteobjects - qtsvg - qtscxml - qttools - qttranslations - qtvirtualkeyboard - qtwebchannel - qtwebengine - qtwebsockets - qtwebview - ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - qtwayland - libglvnd - ] - ) - ) { }; - qt3d = callPackage ./modules/qt3d.nix { }; qt5compat = callPackage ./modules/qt5compat.nix { }; qtcharts = callPackage ./modules/qtcharts.nix { }; @@ -213,6 +161,9 @@ let }; } ./hooks/qmake-hook.sh ) { }; + } + // lib.optionalAttrs config.allowAliases { + full = throw "qt6.full has been removed. Please use individual packages instead."; # Added 2025-10-21 }; baseScope = makeScopeWithSplicing' {