From 3abc5f7093e5849eccc7e1ab82a48861c4ac4489 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 1 Jul 2024 11:14:42 -0700 Subject: [PATCH] pidginPackages: move __attrsFailEvaluation to allow deeper evaluation The test (`nix-build pkgs/test/release/default.nix`) continues to pass. --- .../instant-messengers/pidgin/pidgin-plugins/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix index 4d4fa9521fc4..09d7bed922ee 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix @@ -14,7 +14,8 @@ lib.makeScope newScope (self: plugins = []; }; - pidginPackages = self; + # Prevent `pkgs/top-level/release-attrpaths-superset.nix` from recursing here. + pidginPackages = self // { pidginPackages = self.pidginPackages // { __attrsFailEvaluation = true; }; }; pidgin-indicator = callPackage ./pidgin-indicator { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc27ad457ee3..da5d8ddee2ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33436,10 +33436,7 @@ with pkgs; picosnitch = callPackage ../tools/networking/picosnitch { }; - pidginPackages = - let pidgin-plugins = - recurseIntoAttrs (callPackage ../applications/networking/instant-messengers/pidgin/pidgin-plugins { }); - in pidgin-plugins // { pidginPackages = pidgin-plugins.pidginPackages // { __attrsFailEvaluation = true; }; }; + pidginPackages = callPackage ../applications/networking/instant-messengers/pidgin/pidgin-plugins { }; inherit (pidginPackages) pidgin;