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

Merge pull request #324622 from philiptaron/__attrsFailEvaluation/qt5

Browse Source 
qt5: remove __attrsFailEvaluation as all attrsets evaluate
This commit is contained in:
Silvan Mosberger 2024-07-26 01:59:06 +02:00 committed by GitHub
commit 14449c6e93
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/qt-5/5.15/default.nix
View File

@ -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;

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

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