mirror/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-29 07:32:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #266859 from GaetanLepage/coq-nvim

Browse Source 
vimPlugins.coq_nvim: update python dependencies
This commit is contained in:
figsoda 2023-11-15 21:41:00 -05:00 committed by GitHub
commit c798d8f0a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/editors/vim/plugins/patches/coq_nvim/emulate-venv.patch
View File

@ -1,15 +1,15 @@
diff --git a/coq/__main__.py b/coq/__main__.py diff --git a/coq/__main__.py b/coq/__main__.py
index 5a6c6fd2..e0d9eec8 100644 index dd40afc1..36bcca21 100644
--- a/coq/__main__.py --- a/coq/__main__.py
+++ b/coq/__main__.py +++ b/coq/__main__.py
@@ -78,7 +78,7 @@ _EXEC_PATH = Path(executable) @@ -78,7 +78,7 @@ _EXEC_PATH = Path(executable)
_EXEC_PATH = _EXEC_PATH.parent.resolve(strict=True) / _EXEC_PATH.name _EXEC_PATH = _EXEC_PATH.parent.resolve(strict=True) / _EXEC_PATH.name
_REQ = REQUIREMENTS.read_text() _REQ = REQUIREMENTS.read_text()
-_IN_VENV = _RT_PY == _EXEC_PATH -_IN_VENV = _RT_PY == _EXEC_PATH
+_IN_VENV = True +_IN_VENV = True
if command == "deps": if command == "deps":
@@ -152,7 +152,7 @@ elif command == "run": @@ -152,7 +152,7 @@ elif command == "run":
try: try:
@ -21,15 +21,15 @@ index 5a6c6fd2..e0d9eec8 100644
else: else:
import pynvim_pp import pynvim_pp
diff --git a/coq/consts.py b/coq/consts.py diff --git a/coq/consts.py b/coq/consts.py
index 5a027fe9..a3e0c5a4 100644 index 804e92ab..5c090a93 100644
--- a/coq/consts.py --- a/coq/consts.py
+++ b/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" REQUIREMENTS = TOP_LEVEL / "requirements.txt"
-VARS = TOP_LEVEL / ".vars" -VARS = TOP_LEVEL / ".vars"
+VARS = Path.home() / ".cache/coq_nvim/vars" +VARS = Path.home() / ".cache/coq_nvim/vars"
RT_DIR = VARS / "runtime" RT_DIR = VARS / "runtime"
RT_PY = RT_DIR / "Scripts" / "python.exe" if IS_WIN else RT_DIR / "bin" / "python3" RT_PY = RT_DIR / "Scripts" / "python.exe" if IS_WIN else RT_DIR / "bin" / "python3"

9
pkgs/development/python-modules/pynvim-pp/default.nix
View File

@ -7,15 +7,14 @@
buildPythonPackage { buildPythonPackage {
pname = "pynvim-pp"; pname = "pynvim-pp";
version = "unstable-2023-07-09"; version = "unstable-2023-08-03";
pyproject = true;
format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ms-jpq"; owner = "ms-jpq";
repo = "pynvim_pp"; repo = "pynvim_pp";
rev = "93aa25bf3ee039c4eb85f402d6adf6977033013b"; rev = "40d0f6053ddbba61f53505eebb0290cfb661661b";
hash = "sha256-gZvIiFpP+eMLD8/xodY7ywWxhWXtethXviVRedW/bgo="; hash = "sha256-4jeYE9HL+PQZuJq5nyf9CgL4UrRWm3ifLL/vfygLOwc=";
}; };
nativeBuildInputs = [ setuptools ]; nativeBuildInputs = [ setuptools ];

9
pkgs/development/python-modules/std2/default.nix
View File

@ -6,15 +6,14 @@
buildPythonPackage { buildPythonPackage {
pname = "std2"; pname = "std2";
version = "unstable-2023-07-09"; version = "unstable-2023-10-07";
pyproject = true;
format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ms-jpq"; owner = "ms-jpq";
repo = "std2"; repo = "std2";
rev = "2d5594b40585ecae60ce5175bee68cc8b3085ee6"; rev = "6332e559ee51c3a7c956804afdd7e1cc6ad47965";
hash = "sha256-phGIWow7PGOtS1Pre1Gz0Xg6izGp6BiUTmze5jI/BwY="; hash = "sha256-huN7P/Ws6anrFXDG7L5xxMenS25BHquV9cMi1s7WFJ4=";
}; };
nativeBuildInputs = [ setuptools ]; nativeBuildInputs = [ setuptools ];