From 98e0220502e6b662d5b75c5b46ba0a7427dc9c9d Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 26 Nov 2020 20:28:09 +0100 Subject: [PATCH] Use build packages in setup hook https://github.com/NixOS/nixpkgs/pull/104201 broke this. --- hooks/default.nix | 2 +- mk-poetry-dep.nix | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hooks/default.nix b/hooks/default.nix index 6d60df2..17b42c1 100644 --- a/hooks/default.nix +++ b/hooks/default.nix @@ -1,11 +1,11 @@ { python -, callPackage , makeSetupHook , yj , wheel , pip }: let + callPackage = python.pythonForBuild.pkgs.callPackage; pythonInterpreter = python.pythonForBuild.interpreter; pythonSitePackages = python.sitePackages; in diff --git a/mk-poetry-dep.nix b/mk-poetry-dep.nix index f19a6d8..c01f99c 100644 --- a/mk-poetry-dep.nix +++ b/mk-poetry-dep.nix @@ -92,10 +92,7 @@ pythonPackages.callPackage "setuptools-scm" "toml" # Toml is an extra for setuptools-scm ]; - baseBuildInputs = - lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm - ++ lib.optional (! lib.elem name [ "pip" "setuptools" "wheel" ]) pythonPackages.wheel - ; + baseBuildInputs = lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm; format = if isLocal || isGit || isUrl then "pyproject" else fileInfo.format; in buildPythonPackage {