Merge pull request #266859 from GaetanLepage/coq-nvim

vimPlugins.coq_nvim: update python dependencies

figsoda c798d8f0 5e258d13

Changed files
+17 -19
pkgs
applications
editors
vim
plugins
patches
development
python-modules
pynvim-pp
std2
+9 -9
pkgs/applications/editors/vim/plugins/patches/coq_nvim/emulate-venv.patch
···
diff --git a/coq/__main__.py b/coq/__main__.py
-
index 5a6c6fd2..e0d9eec8 100644
+
index dd40afc1..36bcca21 100644
--- a/coq/__main__.py
+++ b/coq/__main__.py
@@ -78,7 +78,7 @@ _EXEC_PATH = Path(executable)
_EXEC_PATH = _EXEC_PATH.parent.resolve(strict=True) / _EXEC_PATH.name
_REQ = REQUIREMENTS.read_text()
-
+
-_IN_VENV = _RT_PY == _EXEC_PATH
+_IN_VENV = True
-
-
+
+
if command == "deps":
@@ -152,7 +152,7 @@ elif command == "run":
try:
···
else:
import pynvim_pp
diff --git a/coq/consts.py b/coq/consts.py
-
index 5a027fe9..a3e0c5a4 100644
+
index 804e92ab..5c090a93 100644
--- a/coq/consts.py
+++ b/coq/consts.py
-
@@ -9,7 +9,7 @@ TOP_LEVEL = Path(__file__).resolve(strict=True).parent.parent
+
@@ -10,7 +10,7 @@ TOP_LEVEL = Path(__file__).resolve(strict=True).parent.parent
REQUIREMENTS = TOP_LEVEL / "requirements.txt"
-
-
+
+
-VARS = TOP_LEVEL / ".vars"
+VARS = Path.home() / ".cache/coq_nvim/vars"
-
+
RT_DIR = VARS / "runtime"
RT_PY = RT_DIR / "Scripts" / "python.exe" if IS_WIN else RT_DIR / "bin" / "python3"
+4 -5
pkgs/development/python-modules/pynvim-pp/default.nix
···
buildPythonPackage {
pname = "pynvim-pp";
-
version = "unstable-2023-07-09";
-
-
format = "pyproject";
+
version = "unstable-2023-08-03";
+
pyproject = true;
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "pynvim_pp";
-
rev = "93aa25bf3ee039c4eb85f402d6adf6977033013b";
-
hash = "sha256-gZvIiFpP+eMLD8/xodY7ywWxhWXtethXviVRedW/bgo=";
+
rev = "40d0f6053ddbba61f53505eebb0290cfb661661b";
+
hash = "sha256-4jeYE9HL+PQZuJq5nyf9CgL4UrRWm3ifLL/vfygLOwc=";
};
nativeBuildInputs = [ setuptools ];
+4 -5
pkgs/development/python-modules/std2/default.nix
···
buildPythonPackage {
pname = "std2";
-
version = "unstable-2023-07-09";
-
-
format = "pyproject";
+
version = "unstable-2023-10-07";
+
pyproject = true;
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "std2";
-
rev = "2d5594b40585ecae60ce5175bee68cc8b3085ee6";
-
hash = "sha256-phGIWow7PGOtS1Pre1Gz0Xg6izGp6BiUTmze5jI/BwY=";
+
rev = "6332e559ee51c3a7c956804afdd7e1cc6ad47965";
+
hash = "sha256-huN7P/Ws6anrFXDG7L5xxMenS25BHquV9cMi1s7WFJ4=";
};
nativeBuildInputs = [ setuptools ];