diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 0fcae043a793..96a498c5f195 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -208,9 +208,6 @@ let }; } ./hooks/qmake-hook.sh) { }; - } // lib.optionalAttrs config.allowAliases { - # 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 c1ac5b0f52ee..028b1196fc96 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -68,7 +68,7 @@ makeScopeWithSplicing' { }; in (lib.makeOverridable mkMaui attrs); - noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideScope'" "overrideDerivation" ]; + noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideDerivation" ]; in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // mauiPackages // qt5 // { @@ -292,8 +292,5 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP xwaylandvideobridge = callPackage ../tools/wayland/xwaylandvideobridge { }; yuview = callPackage ../applications/video/yuview { }; -}) // lib.optionalAttrs pkgs.config.allowAliases { - # 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 6bd557864b0e..366fa799fa0e 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -25,7 +25,7 @@ makeScopeWithSplicing' { otherSplices = generateSplicesForMkScope "qt6Packages"; f = (self: let inherit (self) callPackage; - noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideScope'" "overrideDerivation" ]; + noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideDerivation" ]; in (noExtraAttrs qt6) // { inherit stdenv; @@ -117,8 +117,5 @@ makeScopeWithSplicing' { wayqt = callPackage ../development/libraries/wayqt { }; xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { }; - } // lib.optionalAttrs pkgs.config.allowAliases { - # Remove completely before 24.11 - overrideScope' = builtins.throw "qt6Packages now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"."; }); }