diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-03-24 10:15:32 +0100 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-03-24 10:15:32 +0100 |
| commit | 96f063dd321abc80ecaa156226cfb7cf9540315a (patch) | |
| tree | 7a53ef61484fc7bfff6419b1fd635c67199f27d2 /nixpkgs/pkgs/development/python-modules/hglib | |
| parent | af58f08d3d524e7b008b73a8497ea710915ffaf1 (diff) | |
| parent | d96bd3394b734487d1c3bfbac0e8f17465e03afe (diff) | |
Merge commit 'd96bd3394b734487d1c3bfbac0e8f17465e03afe'
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/hglib')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/hglib/default.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/hglib/default.nix b/nixpkgs/pkgs/development/python-modules/hglib/default.nix index eab8ffe2bfd..14e5b4edcd7 100644 --- a/nixpkgs/pkgs/development/python-modules/hglib/default.nix +++ b/nixpkgs/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; { |