dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

{qt5,qt6}: remove overrideScope' errors

Browse Source 
Scheduled for removal for 24.11.
This commit is contained in:
Wolfgang Walther 2024-11-17 14:50:05 +01:00
parent 89981f1968
commit 352f462ad9
No known key found for this signature in database
GPG Key ID: B39893FA5F65CAE1
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/qt-6/default.nix
View File

@ -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' {

7
pkgs/top-level/qt5-packages.nix
View File

@ -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\".";
}));
})));
}

5
pkgs/top-level/qt6-packages.nix
View File

@ -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\".";
});
}