git.iko.soy/typeable/nixpkgs
on master help sign in
python3Packages.pre-commit: 2.15.0 -> 2.16.0
commit574e92dac65adab09b44ab101cde1b4b1737a7b7 authorFabian Affolter <mail@fabian-affolter.ch> dateWed 1 Dec 2021, 11:57 (5 years ago) parent461a7d2
2 files changed+16−29
compare with master
unifiedsplit
pkgs/development/python-modules/pre-commit/default.nix+16−14 pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch−15
pkgs/development/python-modules/pre-commit/default.nix+16−14
@@ -1,47 +1,47 @@
11{ lib
2−, fetchPypi
32, buildPythonPackage
4−, pythonOlder
5−, aspy-yaml
6−, cached-property
73, cfgv
4+, fetchPypi
85, identify
96, importlib-metadata
107, importlib-resources
118, nodeenv
129, python
13−, six
10+, pythonOlder
11+, pyyaml
1412, toml
1513, virtualenv
1614}:
1715
1816buildPythonPackage rec {
1917 pname = "pre-commit";
20− version = "2.15.0";
18+ version = "2.16.0";
19+ format = "setuptools";
20+
2121 disabled = pythonOlder "3.6";
2222
2323 src = fetchPypi {
2424 inherit version;
2525 pname = "pre_commit";
26− sha256 = "sha256-PCWt1429+2ooplF4DVwxGsQN0X8WDrOVSgxZ2kClBac=";
26+ sha256 = "sha256-/piXysgwqnFk29AqTnuQyuSWMEUc6IRkvKc9tIa6n2U=";
2727 };
2828
2929 patches = [
30− ./hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch
3130 ./languages-use-the-hardcoded-path-to-python-binaries.patch
3231 ];
3332
3433 propagatedBuildInputs = [
35− aspy-yaml
36− cached-property
3734 cfgv
3835 identify
3936 nodeenv
40− six
37+ pyyaml
4138 toml
4239 virtualenv
43− ] ++ lib.optional (pythonOlder "3.8") importlib-metadata
44− ++ lib.optional (pythonOlder "3.7") importlib-resources;
40+ ] ++ lib.optional (pythonOlder "3.8") [
41+ importlib-metadata
42+ ] ++ lib.optional (pythonOlder "3.7") [
43+ importlib-resources
44+ ];
4545
4646 # slow and impure
4747 doCheck = false;
@@ -55,7 +55,9 @@ buildPythonPackage rec {
5555 --subst-var-by nodeenv ${nodeenv}
5656 '';
5757
58− pythonImportsCheck = [ "pre_commit" ];
58+ pythonImportsCheck = [
59+ "pre_commit"
60+ ];
5961
6062 meta = with lib; {
6163 description = "A framework for managing and maintaining multi-language pre-commit hooks";
pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patchdeleted−15
@@ -1,15 +0,0 @@
1−diff --git a/pre_commit/resources/hook-tmpl b/pre_commit/resources/hook-tmpl
2−index 299144e..6d12543 100755
3−--- a/pre_commit/resources/hook-tmpl
4−+++ b/pre_commit/resources/hook-tmpl
5−@@ -25,8 +25,8 @@ ARGS.append('--')
6− ARGS.extend(sys.argv[1:])
7−
8− DNE = '`pre-commit` not found. Did you forget to activate your virtualenv?'
9−-if os.access(INSTALL_PYTHON, os.X_OK):
10−- CMD = [INSTALL_PYTHON, '-mpre_commit']
11−+if os.access('@pre-commit@/bin/pre-commit', os.X_OK):
12−+ CMD = ['@pre-commit@/bin/pre-commit']
13− elif which('pre-commit'):
14− CMD = ['pre-commit']
15− else: