diff options
| author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2019-01-24 10:09:20 +0100 |
|---|---|---|
| committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2019-01-24 10:27:49 +0100 |
| commit | e138c1e4e88ffe1058268d5891802447e0b525e0 (patch) | |
| tree | a0025cbf9c015fc85a4a43577ed16cc1b8c68c38 /pkgs/development/python-modules/GitPython | |
| parent | b76961124d938dae59e4c9db90832b87ccb1b42b (diff) | |
| download | nixpkgs-e138c1e4e88ffe1058268d5891802447e0b525e0.tar nixpkgs-e138c1e4e88ffe1058268d5891802447e0b525e0.tar.gz nixpkgs-e138c1e4e88ffe1058268d5891802447e0b525e0.tar.bz2 nixpkgs-e138c1e4e88ffe1058268d5891802447e0b525e0.tar.lz nixpkgs-e138c1e4e88ffe1058268d5891802447e0b525e0.tar.xz nixpkgs-e138c1e4e88ffe1058268d5891802447e0b525e0.tar.zst nixpkgs-e138c1e4e88ffe1058268d5891802447e0b525e0.zip | |
python.pkgs.GitPython: use patch to specify path to git
Diffstat (limited to 'pkgs/development/python-modules/GitPython')
| -rw-r--r-- | pkgs/development/python-modules/GitPython/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/python-modules/GitPython/hardcode-git-path.patch | 13 |
2 files changed, 21 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index aef59ba2ab9..2e011906dc3 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, substituteAll, git, gitdb2, mock, nose, ddt }: buildPythonPackage rec { version = "2.1.11"; @@ -9,13 +9,16 @@ buildPythonPackage rec { sha256 = "8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8"; }; + patches = [ + (substituteAll { + src = ./hardcode-git-path.patch; + inherit git; + }) + ]; + checkInputs = [ mock nose ddt ]; propagatedBuildInputs = [ gitdb2 ]; - postPatch = '' - sed -i "s|^refresh()$|refresh(path='${git}/bin/git')|" git/__init__.py - ''; - # 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 00000000000..93747995992 --- /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) |