diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 96741ee8ae67..6604596fe468 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -203,10 +203,8 @@ let } ./hooks/qmake-hook.sh) { }; } // lib.optionalAttrs config.allowAliases { - # 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) "qt6 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope; + # Remove completely before 24.11 + overrideScope' = builtins.throw "qt6 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"."; }; baseScope = makeScopeWithSplicing' { diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 791df02b6998..331c97d5a4d3 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -293,9 +293,7 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP yuview = callPackage ../applications/video/yuview { }; }) // lib.optionalAttrs pkgs.config.allowAliases { - # Convert to a throw on 01-01-2023. - # Warnings show up in various cli tool outputs, throws do not. - # Remove completely before 24.05 - overrideScope' = lib.warn "libsForQt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope; + # Remove completely before 24.11 + overrideScope' = builtins.throw "libsForQt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"."; })); } diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index eb04beaef279..aab679783224 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -115,9 +115,7 @@ makeScopeWithSplicing' { wayqt = callPackage ../development/libraries/wayqt { }; } // lib.optionalAttrs pkgs.config.allowAliases { - # Convert to a throw on 01-01-2023. - # Warnings show up in various cli tool outputs, throws do not. - # Remove completely before 24.05 - overrideScope' = lib.warn "qt6Packages now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope; + # Remove completely before 24.11 + overrideScope' = builtins.throw "qt6Packages now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"."; }); }