From 9dc514d2946fd3cbce4d5276770655718183000d Mon Sep 17 00:00:00 2001 From: Sem Mulder Date: Mon, 31 Oct 2022 12:32:28 +0100 Subject: [PATCH] Fix infinite recursion for aliases in pkgs/top-level/python-aliases.nix This fixes #750. --- default.nix | 10 ++++++++++ overrides/default.nix | 3 --- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index 4b10b3f..e811c04 100644 --- a/default.nix +++ b/default.nix @@ -221,6 +221,16 @@ lib.makeScope pkgs.newScope (self: { getFunctorFn ( [ + # Remove Python packages aliases with non-normalized names to avoid issues with infinite recursion (issue #750). + (self: super: lib.attrsets.mapAttrs + ( + name: value: + if lib.isDerivation value && self.hasPythonModule value && (normalizePackageName name) != name + then null + else value + ) + super) + ( self: super: { diff --git a/overrides/default.nix b/overrides/default.nix index a190952..6354e4c 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -59,9 +59,6 @@ let in lib.composeManyExtensions [ - # normalize all the names - (self: super: poetryLib.normalizePackageSet super) - # NixOps (self: super: lib.mapAttrs (_: v: addBuildSystem { inherit self; drv = v; attr = "poetry"; }) (lib.filterAttrs (n: _: lib.strings.hasPrefix "nixops" n) super)