mirror of
https://github.com/vale981/poetry2nix
synced 2025-03-06 17:51:40 -05:00
Merge pull request #787 from SemMulder/fix-750
Fix infinite recursion for aliases in pkgs/top-level/python-aliases.nix
This commit is contained in:
commit
ce618e3bf6
2 changed files with 10 additions and 3 deletions
10
default.nix
10
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:
|
||||
{
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Add table
Reference in a new issue