From 7e128265b7803c7cf52bb2bfa7f3a574fdb30e1d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 6 Jul 2023 08:11:54 +0200 Subject: [PATCH] vimPlugins.coq_nvim: use pynvim-pp and std2 from nixpkgs --- .../editors/vim/plugins/overrides.nix | 40 +------------------ 1 file changed, 2 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f68c6ad0a4b4..bc4fe327ce8a 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -335,45 +335,9 @@ self: super: { coq_nvim = super.coq_nvim.overrideAttrs { passthru.python3Dependencies = ps: with ps; [ - pynvim + pynvim-pp pyyaml - (buildPythonPackage { - pname = "pynvim_pp"; - version = "unstable-2023-05-17"; - format = "pyproject"; - propagatedBuildInputs = [ setuptools pynvim ]; - src = fetchFromGitHub { - owner = "ms-jpq"; - repo = "pynvim_pp"; - rev = "91d91ec0cb173ce19d8c93c7999f5038cf08c046"; - fetchSubmodules = false; - hash = "sha256-wycN9U3f3o0onmx60Z4Ws4DbBxsNwHjLTCB9UgjssLI="; - }; - meta = with lib; { - homepage = "https://github.com/ms-jpq/pynvim_pp"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ GaetanLepage ]; - }; - }) - (buildPythonPackage { - pname = "std2"; - version = "unstable-2023-05-17"; - format = "pyproject"; - propagatedBuildInputs = [ setuptools ]; - src = fetchFromGitHub { - owner = "ms-jpq"; - repo = "std2"; - rev = "d6a7a719ef902e243b7bbd162defed762a27416f"; - fetchSubmodules = false; - hash = "sha256-dtQaeB4Xkz+wcF0UkM+SajekSkVVPdoJs9n1hHQLR1k="; - }; - doCheck = true; - meta = with lib; { - homepage = "https://github.com/ms-jpq/std2"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ GaetanLepage ]; - }; - }) + std2 ]; # We need some patches so it stops complaining about not being in a venv