Unverified Commit 14449c6e authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

Merge pull request #324622 from philiptaron/__attrsFailEvaluation/qt5 

qt5: remove __attrsFailEvaluation as all attrsets evaluate
parents 06957669 ca22006a

pkgs/development/libraries/qt-5/5.15/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;

pkgs/top-level/qt5-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -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 // {