movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 14:10:33 +03:00
Code Activity

pre-commit: 2.7.1 -> 2.11.0

Browse source
This commit is contained in:
Austin Butler 2021-03-08 16:56:06 -08:00
parent fab58377ab
commit 2682b98a52
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/python-modules/pre-commit/default.nix
View file

@ -2,7 +2,6 @@
, aspy-yaml , aspy-yaml
, cached-property , cached-property
, cfgv , cfgv
, futures
, identify , identify
, importlib-metadata , importlib-metadata
, importlib-resources , importlib-resources
@ -16,13 +15,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pre-commit"; pname = "pre-commit";
version = "2.7.1"; version = "2.11.0";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "pre_commit"; pname = "pre_commit";
sha256 = "0w2a104yhbw1z92rcwpq0gdjsxvr2bwx5ry5xhlf2psnfkjx6ky5"; sha256 = "15f1chxrbmfcajk1ngk3jvf6jjbigb5dg66wnn7phmlywaawpy06";
}; };
patches = [ patches = [

14
pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
View file

@ -12,15 +12,15 @@ index 26f4919..4885ec1 100644
if version != C.DEFAULT: if version != C.DEFAULT:
cmd.extend(['-n', version]) cmd.extend(['-n', version])
diff --git a/pre_commit/languages/python.py b/pre_commit/languages/python.py diff --git a/pre_commit/languages/python.py b/pre_commit/languages/python.py
index e17376e..0c1d2ab 100644 index 43b7280..f0f2338 100644
--- a/pre_commit/languages/python.py --- a/pre_commit/languages/python.py
+++ b/pre_commit/languages/python.py +++ b/pre_commit/languages/python.py
@@ -204,7 +204,7 @@ def install_environment( @@ -192,7 +192,7 @@ def install_environment(
additional_dependencies: Sequence[str],
) -> None: ) -> None:
envdir = prefix.path(helpers.environment_dir(ENVIRONMENT_DIR, version)) envdir = prefix.path(helpers.environment_dir(ENVIRONMENT_DIR, version))
- venv_cmd = [sys.executable, '-mvirtualenv', envdir]
+ venv_cmd = ['@virtualenv@/bin/virtualenv', envdir]
python = norm_version(version) python = norm_version(version)
- venv_cmd = (sys.executable, '-mvirtualenv', envdir, '-p', python) if python is not None:
+ venv_cmd = ('@virtualenv@/bin/virtualenv', envdir, '-p', python) venv_cmd.extend(('-p', python))
install_cmd = ('python', '-mpip', 'install', '.', *additional_dependencies)
with clean_path_on_failure(envdir):