From a8ad2d3f5607e0a4c23945cc14f86d792e035bb4 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Tue, 24 Oct 2023 06:31:52 -0400 Subject: [PATCH] chore: remove vendored pyproject-hooks --- overrides/default.nix | 5 ++- overrides/pyproject-hooks.nix | 73 ----------------------------------- 2 files changed, 4 insertions(+), 74 deletions(-) delete mode 100644 overrides/pyproject-hooks.nix diff --git a/overrides/default.nix b/overrides/default.nix index 60f16c5ee..43142cac4 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -1946,7 +1946,10 @@ lib.composeManyExtensions [ }; tomli = self.callPackage ./tomli.nix { }; - pyproject-hooks = self.callPackage ./pyproject-hooks.nix { }; + + pyproject-hooks = pkgs.python3.pkgs.pyproject-hooks.override { + inherit (self) buildPythonPackage flit-core setuptools tomli; + }; wheel = pkgs.python3.pkgs.wheel.override { inherit (self) buildPythonPackage flit-core; diff --git a/overrides/pyproject-hooks.nix b/overrides/pyproject-hooks.nix deleted file mode 100644 index 3624b5f02..000000000 --- a/overrides/pyproject-hooks.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, flit-core -, pyproject-hooks -, pytestCheckHook -, pythonOlder -, setuptools -, testpath -, tomli -}: - -buildPythonPackage rec { - pname = "pyproject-hooks"; - version = "1.0.0"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; - - src = fetchPypi rec { - pname = "pyproject_hooks"; - inherit version; - hash = "sha256-8nGymLl/WVXVP7ErcsH7GUjCLBprcLMVxUztrKAmTvU="; - }; - - nativeBuildInputs = [ - flit-core - ]; - - propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ - tomli - ]; - - # We need to disable tests because this package is part of the bootstrap chain - # and its test dependencies cannot be built yet when this is being built. - doCheck = false; - - passthru.tests = { - pytest = buildPythonPackage { - pname = "${pname}-pytest"; - inherit version; - format = "other"; - - dontBuild = true; - dontInstall = true; - - nativeCheckInputs = [ - pyproject-hooks - pytestCheckHook - setuptools - testpath - ]; - - disabledTests = [ - # fail to import setuptools - "test_setup_py" - "test_issue_104" - ]; - }; - }; - - pythonImportsCheck = [ - "pyproject_hooks" - ]; - - meta = with lib; { - description = "Low-level library for calling build-backends in `pyproject.toml`-based project "; - homepage = "https://github.com/pypa/pyproject-hooks"; - changelog = "https://github.com/pypa/pyproject-hooks/blob/v${version}/docs/changelog.rst"; - license = licenses.mit; - maintainers = teams.python.members; - }; -}