colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #79202 from veprbl/pr/hglib_fix

Browse Source 
pythonPackages.hglib: fix tests
This commit is contained in:
Dmitry Kalinkin 2020-02-05 15:21:52 -05:00 committed by GitHub
commit 87c12d7dd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/python-modules/hglib/default.nix
View File

@ -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; {