Merge branch 'master' into fix/man-in-outputsToInstall

2 files changed, 44 insertions, 0 deletions

diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix
new file mode 100644
index 000000000000..24fe4a2458d6
--- /dev/null
+++ b/pkgs/development/python-modules/GitPython/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb2, mock, nose, ddt }:
+
+buildPythonPackage rec {
+  version = "2.1.11";
+  pname = "GitPython";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8";
+  };
+
+  patches = [
+    (substituteAll {
+      src = ./hardcode-git-path.patch;
+      inherit git;
+    })
+  ];
+
+  checkInputs = [ nose ] ++ lib.optional isPy27 mock;
+  propagatedBuildInputs = [ gitdb2 ddt ];
+
+  # Tests require a git repo
+  doCheck = false;
+
+  meta = {
+    description = "Python Git Library";
+    maintainers = [ ];
+    homepage = https://github.com/gitpython-developers/GitPython;
+    license = lib.licenses.bsd3;
+  };
+}
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)