git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #115460 from austinbutler/pre-commit-2-11-0

pre-commit: 2.7.1 -> 2.11.0

commit52962f598c618f831b5c586f3222da08b0eb1c2e authorSandro <sandro.jaeckel@gmail.com> dateWed 10 Mar 2021, 21:52 (6 years ago) parent5cd998a2682b98
2 files changed+9−10
pkgs/development/python-modules/pre-commit/default.nix+2−3 pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch+7−7
pkgs/development/python-modules/pre-commit/default.nix+2−3
@@ -2,7 +2,6 @@
22, aspy-yaml
33, cached-property
44, cfgv
5−, futures
65, identify
76, importlib-metadata
87, importlib-resources
@@ -16,13 +15,13 @@
1615
1716buildPythonPackage rec {
1817 pname = "pre-commit";
19− version = "2.7.1";
18+ version = "2.11.0";
2019 disabled = isPy27;
2120
2221 src = fetchPypi {
2322 inherit version;
2423 pname = "pre_commit";
25− sha256 = "0w2a104yhbw1z92rcwpq0gdjsxvr2bwx5ry5xhlf2psnfkjx6ky5";
24+ sha256 = "15f1chxrbmfcajk1ngk3jvf6jjbigb5dg66wnn7phmlywaawpy06";
2625 };
2726
2827 patches = [
pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch+7−7
@@ -12,15 +12,15 @@ index 26f4919..4885ec1 100644
1212 if version != C.DEFAULT:
1313 cmd.extend(['-n', version])
1414diff --git a/pre_commit/languages/python.py b/pre_commit/languages/python.py
15−index e17376e..0c1d2ab 100644
15+index 43b7280..f0f2338 100644
1616--- a/pre_commit/languages/python.py
1717+++ b/pre_commit/languages/python.py
18−@@ -204,7 +204,7 @@ def install_environment(
18+@@ -192,7 +192,7 @@ def install_environment(
19+ additional_dependencies: Sequence[str],
1920 ) -> None:
2021 envdir = prefix.path(helpers.environment_dir(ENVIRONMENT_DIR, version))
22+- venv_cmd = [sys.executable, '-mvirtualenv', envdir]
23++ venv_cmd = ['@virtualenv@/bin/virtualenv', envdir]
2124 python = norm_version(version)
22−- venv_cmd = (sys.executable, '-mvirtualenv', envdir, '-p', python)
23−+ venv_cmd = ('@virtualenv@/bin/virtualenv', envdir, '-p', python)
24− install_cmd = ('python', '-mpip', 'install', '.', *additional_dependencies)
25−
26− with clean_path_on_failure(envdir):
25+ if python is not None:
26+ venv_cmd.extend(('-p', python))