From dccdfca8096c98b09844e99fefaf56ffdde49bf0 Mon Sep 17 00:00:00 2001 From: gjeusel Date: Sat, 4 Nov 2017 11:48:38 +0100 Subject: [PATCH] tortoisehg: 4.1.1 -> 4.3.1, fix license dialog, check imports Cherry picked from commits ba885e1d7decd14dd70c1602a208eda4d2b352cb, 450123ca30a0b675fae90d57bc2bce55935ef49e, ae2cf0bee8da88e2f4ecf8e227a7ca56f32c0171. --- .../version-management/tortoisehg/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 1a0c506a19d4..f06a0c90db14 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,25 +2,32 @@ python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "4.1.1"; + version = "4.3.1"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "14fy5p5hx4iij5kyma9679nrprd9lsjr6j047bfyfrwa3l4knj2g"; + sha256 = "0lxppjdqjmwl5y8fmp2am0my7a3mks811yg4fff7cx0569hdp62n"; }; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ]; - doCheck = false; + doCheck = true; dontStrip = true; buildPhase = ""; installPhase = '' ${python2Packages.python.executable} setup.py install --prefix=$out + mkdir -p $out/share/doc/tortoisehg + cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt.gz ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias ''; + checkPhase = '' + echo "test: thg version" + $out/bin/thg version + ''; + meta = { description = "Qt based graphical tool for working with Mercurial"; homepage = http://tortoisehg.bitbucket.org/;