Skip to content

Commit ce618e3

Browse files
authored
Merge pull request #787 from SemMulder/fix-750
Fix infinite recursion for aliases in pkgs/top-level/python-aliases.nix
2 parents 94fcc58 + 9dc514d commit ce618e3

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

default.nix

+10
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,16 @@ lib.makeScope pkgs.newScope (self: {
221221
getFunctorFn
222222
(
223223
[
224+
# Remove Python packages aliases with non-normalized names to avoid issues with infinite recursion (issue #750).
225+
(self: super: lib.attrsets.mapAttrs
226+
(
227+
name: value:
228+
if lib.isDerivation value && self.hasPythonModule value && (normalizePackageName name) != name
229+
then null
230+
else value
231+
)
232+
super)
233+
224234
(
225235
self: super:
226236
{

overrides/default.nix

-3
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ let
5959

6060
in
6161
lib.composeManyExtensions [
62-
# normalize all the names
63-
(self: super: poetryLib.normalizePackageSet super)
64-
6562
# NixOps
6663
(self: super:
6764
lib.mapAttrs (_: v: addBuildSystem { inherit self; drv = v; attr = "poetry"; }) (lib.filterAttrs (n: _: lib.strings.hasPrefix "nixops" n) super)

0 commit comments

Comments
 (0)