diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-05-02 17:37:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 17:37:20 -0400 |
| commit | 296e8fef618c7597c3dfa84be2fcdb2771350b61 (patch) | |
| tree | 36c75341bd3f64da0d722da4fb30ec3a8d0fad87 /pkgs/development/python-modules/GitPython | |
| parent | 4688f4078fa655fa3e56a8a4b2591fb195a7eceb (diff) | |
| parent | 3567b1390fde8681a0f0b4581f2babbe863ede9a (diff) | |
Merge branch 'staging' into mesa_3
Diffstat (limited to 'pkgs/development/python-modules/GitPython')
| -rw-r--r-- | pkgs/development/python-modules/GitPython/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/python-modules/GitPython/hardcode-git-path.patch | 13 |
2 files changed, 22 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index aef59ba2ab91..24fe4a2458d6 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, git, gitdb2, mock, nose, ddt }: +{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb2, mock, nose, ddt }: buildPythonPackage rec { version = "2.1.11"; @@ -9,12 +9,15 @@ buildPythonPackage rec { sha256 = "8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8"; }; - 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) |