From c8e0b62a5e869d1681545fd2dec829ccb8ffab03 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 11 Nov 2023 21:59:02 +0200 Subject: [PATCH] libsForQt5: change comment It wouldn't work that way, idk why I thought it would. --- pkgs/top-level/qt5-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index d675c86797dbd16..ae698676c5f5b29 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -259,8 +259,9 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP yuview = callPackage ../applications/video/yuview { }; }) // lib.optionalAttrs pkgs.config.allowAliases { - # remove after 23.11 branch-off and backport removal to 23.11 - # 23.11 will have a warning for this in `makeScope` itself - overrideScope' = lib.warn "libsForQt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope; + # Convert to a throw on 03-01-2023 and backport the change. + # Warnings show up in various cli tool outputs, throws do not. + # Remove completely before 24.05 + overrideScope' = lib.warnIf (lib.isInOldestRelease 2311) "libsForQt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope; })); }