diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-10-27 10:29:58 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-10-27 10:29:58 +0100 |
| commit | d9c5d584cd027f3a7aa43f8fbc261bb19114f02b (patch) | |
| tree | ff034b35b03a00587f691d9121b23cb5a4bc7d91 /pkgs/development/python-modules/GitPython | |
| parent | 4f43e5fe886374ec918da4bf494710cd58c4adf7 (diff) | |
| parent | 2896f00181b6dd11c3075bfc5706f02beec1e9e3 (diff) | |
Merge branch 'master' into release-docs
It's been a very long time, so I think a merge will be better than
a rebase. There was only one simple conflict.
Diffstat (limited to 'pkgs/development/python-modules/GitPython')
| -rw-r--r-- | pkgs/development/python-modules/GitPython/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/development/python-modules/GitPython/hardcode-git-path.patch | 13 |
2 files changed, 24 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index aef59ba2ab91..78ef323255e4 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -1,20 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi, git, gitdb2, mock, nose, ddt }: +{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb2, mock, nose, ddt }: buildPythonPackage rec { - version = "2.1.11"; + version = "2.1.14"; pname = "GitPython"; src = fetchPypi { inherit pname version; - sha256 = "8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8"; + sha256 = "392f31eaadc19db35a54e3ab7285577fb4a86d96ecee08cf22a573f06633baab"; }; - checkInputs = [ mock nose ddt ]; - propagatedBuildInputs = [ gitdb2 ]; + patches = [ + (substituteAll { + src = ./hardcode-git-path.patch; + inherit git; + }) + ]; - postPatch = '' - sed -i "s|^refresh()$|refresh(path='${git}/bin/git')|" git/__init__.py - ''; + checkInputs = [ nose ] ++ lib.optional isPy27 mock; + propagatedBuildInputs = [ gitdb2 ddt ]; # Tests require a git repo doCheck = false; diff --git a/pkgs/development/python-modules/GitPython/hardcode-git-path.patch b/pkgs/development/python-modules/GitPython/hardcode-git-path.patch new file mode 100644 index 000000000000..937479959926 --- /dev/null +++ b/pkgs/development/python-modules/GitPython/hardcode-git-path.patch @@ -0,0 +1,13 @@ +diff --git a/git/cmd.py b/git/cmd.py +index a4faefe..51ad442 100644 +--- a/git/cmd.py ++++ b/git/cmd.py +@@ -175,7 +175,7 @@ class Git(LazyMixin): + + # CONFIGURATION + +- git_exec_name = "git" # default that should work on linux and windows ++ git_exec_name = "@git@/bin/git" + + # Enables debugging of GitPython's git commands + GIT_PYTHON_TRACE = os.environ.get("GIT_PYTHON_TRACE", False) |