{qt5,qt6}: remove overrideScope' errors

Scheduled for removal for 24.11.

+3 -12
-3
pkgs/development/libraries/qt-6/default.nix
··· 208 }; 209 } ./hooks/qmake-hook.sh) 210 { }; 211 - } // lib.optionalAttrs config.allowAliases { 212 - # Remove completely before 24.11 213 - overrideScope' = builtins.throw "qt6 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"."; 214 }; 215 216 baseScope = makeScopeWithSplicing' {
··· 208 }; 209 } ./hooks/qmake-hook.sh) 210 { }; 211 }; 212 213 baseScope = makeScopeWithSplicing' {
+2 -5
pkgs/top-level/qt5-packages.nix
··· 68 }; 69 in (lib.makeOverridable mkMaui attrs); 70 71 - noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideScope'" "overrideDerivation" ]; 72 73 in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // mauiPackages // qt5 // { 74 ··· 292 xwaylandvideobridge = callPackage ../tools/wayland/xwaylandvideobridge { }; 293 294 yuview = callPackage ../applications/video/yuview { }; 295 - }) // lib.optionalAttrs pkgs.config.allowAliases { 296 - # Remove completely before 24.11 297 - overrideScope' = builtins.throw "libsForQt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"."; 298 - })); 299 }
··· 68 }; 69 in (lib.makeOverridable mkMaui attrs); 70 71 + noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideDerivation" ]; 72 73 in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // mauiPackages // qt5 // { 74 ··· 292 xwaylandvideobridge = callPackage ../tools/wayland/xwaylandvideobridge { }; 293 294 yuview = callPackage ../applications/video/yuview { }; 295 + }))); 296 }
+1 -4
pkgs/top-level/qt6-packages.nix
··· 25 otherSplices = generateSplicesForMkScope "qt6Packages"; 26 f = (self: let 27 inherit (self) callPackage; 28 - noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideScope'" "overrideDerivation" ]; 29 in (noExtraAttrs qt6) // { 30 inherit stdenv; 31 ··· 117 wayqt = callPackage ../development/libraries/wayqt { }; 118 119 xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { }; 120 - } // lib.optionalAttrs pkgs.config.allowAliases { 121 - # Remove completely before 24.11 122 - overrideScope' = builtins.throw "qt6Packages now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"."; 123 }); 124 }
··· 25 otherSplices = generateSplicesForMkScope "qt6Packages"; 26 f = (self: let 27 inherit (self) callPackage; 28 + noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideDerivation" ]; 29 in (noExtraAttrs qt6) // { 30 inherit stdenv; 31 ··· 117 wayqt = callPackage ../development/libraries/wayqt { }; 118 119 xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { }; 120 }); 121 }