From 1ba85e5fd5ed2d2607b6cfebd8dbb1369a1e7d84 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 4 Jul 2024 10:25:38 -0700 Subject: [PATCH 1/2] qt5.srcs: remove __attrsFailEvaluation --- pkgs/development/libraries/qt-5/5.15/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index dabb77ea0c85..1f9157e4a665 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -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; From ca22006a5098b414220438a275f405168fe930d6 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 4 Jul 2024 14:10:12 -0700 Subject: [PATCH 2/2] plasma5Packages: all attrsets evaluate, so remove __attrsFailEvaluation --- pkgs/top-level/qt5-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 331c97d5a4d3..21dc6a23d218 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -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 // {