diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-02-04 00:41:20 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-02-04 12:47:05 -0500 |
| commit | a745c846d411f32451d47ca1fc81fd46e5106d2d (patch) | |
| tree | 7bcb40b2f72ea09628a011604f04fab69c56dd2b /pkgs/development/python-modules/hglib | |
| parent | 1e7b414b510237520fd3949278cbfe99175c9454 (diff) | |
pythonPackages.hglib: fix tests
Diffstat (limited to 'pkgs/development/python-modules/hglib')
| -rw-r--r-- | pkgs/development/python-modules/hglib/default.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/hglib/default.nix b/pkgs/development/python-modules/hglib/default.nix index eab8ffe2bfd83..14e5b4edcd7b4 100644 --- a/pkgs/development/python-modules/hglib/default.nix +++ b/pkgs/development/python-modules/hglib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, substituteAll, python, nose, mercurial }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, python, nose, mercurial }: buildPythonPackage rec { pname = "python-hglib"; @@ -14,12 +14,24 @@ buildPythonPackage rec { src = ./hgpath.patch; hg = "${mercurial}/bin/hg"; }) + + # These two patches are needed to fix the tests. + # They will need to be removed on the next update. + (fetchpatch { + url = "https://www.mercurial-scm.org/repo/python-hglib/raw-rev/12e6aaef0f6e"; + sha256 = "159pmhy23gqcc6rkh5jrni8fba4xbhxwcc0jf02wqr7f82kv8a7x"; + }) + (fetchpatch { + url = "https://www.mercurial-scm.org/repo/python-hglib/raw-rev/1a318162f06f"; + sha256 = "04lxfc15m3yw5kvp133xg8zv09l8kndi146xk3lnbbm07fgcnn1z"; + }) ]; checkInputs = [ nose ]; checkPhase = '' - ${python.interpreter} test.py --with-hg "${mercurial}/bin/hg" + ${python.interpreter} test.py --with-hg "${mercurial}/bin/hg" -v \ + --exclude=test_merge_prompt_cb # https://bz.mercurial-scm.org/show_bug.cgi?id=6265 ''; meta = with stdenv.lib; { |