From f557b32a5451cd564e314ebd4b49f8890a0791c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 26 Sep 2024 12:14:29 -0700 Subject: [PATCH] basedpyright: unvendor docify --- pkgs/by-name/ba/basedpyright/package.nix | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 9ef5ebab3be5..97cc7be20293 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -4,6 +4,7 @@ runCommand, buildNpmPackage, stdenvNoCC, + docify, testers, writeText, jq, @@ -61,32 +62,15 @@ let ''; }; - docify = python3.pkgs.buildPythonApplication { - pname = "docify"; - version = "unstable"; - format = "pyproject"; - src = fetchFromGitHub { - owner = "AThePeanut4"; - repo = "docify"; - rev = "7380a6faa6d1e8a3dc790a00254e6d77f84cbd91"; - hash = "sha256-BPR1rc/JzdBweiWmdHxgardDDrJZVWkUIF3ZEmEYf/A="; - }; - buildInputs = [ python3.pkgs.setuptools ]; - propagatedBuildInputs = [ - python3.pkgs.libcst - python3.pkgs.tqdm - ]; - }; - docstubs = stdenvNoCC.mkDerivation { name = "docstubs"; inherit src; - buildInputs = [ docify ]; + nativeBuildInputs = [ docify ]; installPhase = '' runHook preInstall cp -r packages/pyright-internal/typeshed-fallback docstubs - ${docify}/bin/docify docstubs/stdlib --builtins-only --in-place + docify docstubs/stdlib --builtins-only --in-place cp -rv docstubs "$out" runHook postInstall '';