Merge pull request #395 from cpcloud/fix-tomli-inputs

fix: prevent infinite recursion when using tomli
This commit is contained in:
adisbladis 2021-09-22 08:43:03 -05:00 committed by GitHub
commit fb8505b026
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View file

@ -96,6 +96,7 @@ pythonPackages.callPackage
"setuptools_scm"
"setuptools-scm"
"toml" # Toml is an extra for setuptools-scm
"tomli" # tomli is an extra for later versions of setuptools-scm
];
baseBuildInputs = lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm;
format = if isDirectory || isGit || isUrl then "pyproject" else fileInfo.format;

View file

@ -2074,7 +2074,7 @@ self: super:
});
tomli = super.tomli.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or [ ]) ++ [ self.flit-core ];
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.flit-core ];
});
virtualenv = super.virtualenv.overridePythonAttrs (old: {