Skip to content

qt5: remove __attrsFailEvaluation as all attrsets evaluate #324622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
infinisil merged 2 commits into from
Jul 25, 2024
Merged

qt5: remove __attrsFailEvaluation as all attrsets evaluate #324622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ba85e5
qt5.srcs: remove __attrsFailEvaluation
philiptaron Jul 4, 2024
ca22006
plasma5Packages: all attrsets evaluate, so remove __attrsFailEvaluation
philiptaron Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/development/libraries/qt-5/5.15/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Check for any minor version changes.

let

srcs = import ./srcs.nix { inherit lib fetchgit fetchFromGitHub; } // { __attrsFailEvaluation = true; };
srcs = import ./srcs.nix { inherit lib fetchgit fetchFromGitHub; };

qtCompatVersion = srcs.qtbase.version;

Expand Down
4 changes: 1 addition & 3 deletions pkgs/top-level/qt5-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,7 @@ makeScopeWithSplicing' {
};
in (lib.makeOverridable mkMaui attrs);

noExtraAttrs = set:
lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideScope'" "overrideDerivation" ]
// { __attrsFailEvaluation = true; };
noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideScope'" "overrideDerivation" ];

in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // mauiPackages // qt5 // {

Expand Down