From e44d9876eb29c087bd2a396e2ab95b7c69b8b844 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 19 Sep 2021 09:02:45 -0400 Subject: [PATCH 1/2] fix: use nativeBuildInputs in tomli drv This prevents infinite recursion against nixos-unstable-small as of ab126c9a62ca414a933ac19e91d27ddd68cedcd4. --- overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overrides.nix b/overrides.nix index fc0576b..f692db4 100644 --- a/overrides.nix +++ b/overrides.nix @@ -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: { From 3fb12decf1b8ec66c2d3ef0302d35e305dc60c03 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 19 Sep 2021 09:45:41 -0400 Subject: [PATCH 2/2] fix: add tomli to recursion list --- mk-poetry-dep.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/mk-poetry-dep.nix b/mk-poetry-dep.nix index 4051018..dd55fca 100644 --- a/mk-poetry-dep.nix +++ b/mk-poetry-dep.nix @@ -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;