From 369f63c0f4e1ff0a87d82d41456f8e83f0d296d8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 Jul 2024 17:54:29 +0200 Subject: [PATCH 1/2] python{311,312}Packages: restore recurseIntoAttrs for package sets Fixes: 0213840c ("pythonPackages: move __attrsFailEvaluation to allo...") --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84cae899cd6dd..2a64931c538fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17193,8 +17193,8 @@ with pkgs; python27Packages = python27.pkgs; python39Packages = python39.pkgs; python310Packages = python310.pkgs; - python311Packages = python311.pkgs; - python312Packages = python312.pkgs; + python311Packages = recurseIntoAttrs python311.pkgs; + python312Packages = recurseIntoAttrs python312.pkgs; python313Packages = python313.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; From 852453aae1e7d25257b4b817b9a82ea3f600705b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 Jul 2024 18:01:21 +0200 Subject: [PATCH 2/2] coqPackages: restor recurseIntoAttrs Fixes: 0213840 ("pythonPackages: move __attrsFailEvaluation to allo...") --- pkgs/top-level/coq-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index b5fdb99b53343..ef32cb685255b 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -219,6 +219,6 @@ in rec { coqPackages_8_19 = mkCoqPackages coq_8_19; coqPackages_8_20 = mkCoqPackages coq_8_20; - coqPackages = coqPackages_8_19; + coqPackages = recurseIntoAttrs coqPackages_8_19; coq = coqPackages.coq; }