From 8541cdb0d3a0a2b36f6874afaa3f315f441ddb5a Mon Sep 17 00:00:00 2001 From: Patka Date: Mon, 20 May 2024 14:36:22 +0200 Subject: [PATCH] python311Packages.pythonfinder: fix build --- .../python-modules/pythonfinder/default.nix | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix index 37535e49f998d..af5f916dd05a8 100644 --- a/pkgs/development/python-modules/pythonfinder/default.nix +++ b/pkgs/development/python-modules/pythonfinder/default.nix @@ -3,9 +3,7 @@ , cached-property , click , fetchFromGitHub -, fetchpatch , packaging -, pydantic , pytest-timeout , pytestCheckHook , pythonOlder @@ -21,20 +19,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sarugaku"; - repo = pname; + repo = "pythonfinder"; rev = "refs/tags/${version}"; hash = "sha256-CbaKXD7Sde8euRqvc/IHoXoSMF+dNd7vT9LkLWq4/IU="; }; - patches = [ - # https://github.com/sarugaku/pythonfinder/issues/142 - (fetchpatch { - name = "pydantic_2-compatibility.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/python-pythonfinder/-/raw/2.0.6-1/python-pythonfinder-2.0.6-pydantic2.patch"; - hash = "sha256-mON1MeA+pj6VTB3zpBjF3LfB30wG0QH9nU4bD1djWwg="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace " --cov" "" @@ -46,7 +35,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging - pydantic ] ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; @@ -66,13 +54,6 @@ buildPythonPackage rec { "pythonfinder" ]; - # these tests invoke git in a subprocess and - # for some reason git can't be found even if included in nativeCheckInputs - # disabledTests = [ - # "test_shims_are_kept" - # "test_shims_are_removed" - # ]; - meta = with lib; { description = "Cross platform search tool for finding Python"; mainProgram = "pyfinder";