libsForQt5.full: drop
It was broken after qtwebengine (and qtwebview) got tagged insecure in https://github.com/NixOS/nixpkgs/pull/435067
This commit is contained in:
@@ -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' {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -8493,7 +8493,6 @@ with pkgs;
|
||||
plasma5Packages = libsForQt5;
|
||||
|
||||
qtEnv = qt5.env;
|
||||
qt5Full = qt5.full;
|
||||
|
||||
qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { });
|
||||
|
||||
|
||||
Reference in New Issue
Block a user