diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-06-23 18:04:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-23 18:04:39 +0200 |
| commit | 43520486c78e8d874a33f135c36a1b2a75b47480 (patch) | |
| tree | c6bb5f4f16d912dcfe1842845dde8260f18ff5f6 /pkgs/development | |
| parent | 509eb612b390fec734882f3df6a69fd84b5217e9 (diff) | |
| parent | 47558d9e04b84784ed6d6651b496f83f88687d0c (diff) | |
Merge pull request #42345 from Ma27/fix-python-git-annex-adapter
python3Packages.git-annex-adapter: fix build
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/python-modules/git-annex-adapter/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch | 13 |
2 files changed, 24 insertions, 7 deletions
diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index 04fae0db1b7ae..6cb6e626f279f 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -1,5 +1,6 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchurl -, utillinux, pygit2, gitMinimal, git-annex }: +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch +, utillinux, pygit2, gitMinimal, git-annex +}: buildPythonPackage rec { pname = "git-annex-adapter"; @@ -22,10 +23,13 @@ buildPythonPackage rec { ''; # TODO: Remove for next version - patches = fetchurl { - url = "https://github.com/alpernebbi/git-annex-adapter/commit/9f64c4b99cae7b681820c6c7382e1e40489f4d1e.patch"; - sha256 = "1hbw8651amjskakvs1wv2msd1wryrq0vpryvbispg5267rs8q7hp"; - }; + patches = [ + ./not-a-git-repo-testcase.patch + (fetchpatch { + url = "https://github.com/alpernebbi/git-annex-adapter/commit/9f64c4b99cae7b681820c6c7382e1e40489f4d1e.patch"; + sha256 = "0yh66gial6bx7kbl7s7lkzljnkpgvgr8yahqqcq9z76d0w752dir"; + }) + ]; checkInputs = [ utillinux # `rev` is needed in tests/test_process.py @@ -43,6 +47,6 @@ buildPythonPackage rec { homepage = https://github.com/alpernebbi/git-annex-adapter; description = "Call git-annex commands from Python"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda ma27 ]; }; } diff --git a/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch b/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch new file mode 100644 index 0000000000000..2a386ee3f2f91 --- /dev/null +++ b/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch @@ -0,0 +1,13 @@ +diff --git a/tests/test_process.py b/tests/test_process.py +index 493fc8f..feb1833 100644 +--- a/tests/test_process.py ++++ b/tests/test_process.py +@@ -126,7 +126,7 @@ class TestProcessOnEmptyDir(TempDirTestCase): + with self.assertRaises(subprocess.CalledProcessError) as cm: + runner('status', '-sb') + self.assertIn( +- "fatal: Not a git repository", ++ "fatal: not a git repository", + cm.exception.stderr, + ) + |