Merge pull request #14892 from danbst/tortoisehg-refactor

tortoisehg: 3.7.1 -> 3.7.3, refactor
This commit is contained in:
Joachim Fasting 2016-04-22 19:05:56 +02:00
commit f49b9fe9d9
2 changed files with 8 additions and 11 deletions

View File

@ -3,6 +3,7 @@
, ApplicationServices, cf-private }: , ApplicationServices, cf-private }:
let let
# if you bump version, update pkgs.tortoisehg too or ping maintainer
version = "3.7.3"; version = "3.7.3";
name = "mercurial-${version}"; name = "mercurial-${version}";
in in

View File

@ -2,12 +2,11 @@
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
name = "tortoisehg-${version}"; name = "tortoisehg-${version}";
version = "3.7.1"; version = "3.7.3";
namePrefix = "";
src = fetchurl { src = fetchurl {
url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
sha256 = "1ycf8knwk1rs99s5caq611sk4c4nzwyzq8g35hw5kwj15b6dl4k6"; sha256 = "1vahiavpkf9ib2mx8z5i6f0kh072zycazmbrc4sl94p5pvv5w1dh";
}; };
pythonPath = with pythonPackages; [ pyqt4 mercurial qscintilla iniparse ]; pythonPath = with pythonPackages; [ pyqt4 mercurial qscintilla iniparse ];
@ -15,13 +14,10 @@ pythonPackages.buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages; [ qscintilla iniparse ]; propagatedBuildInputs = with pythonPackages; [ qscintilla iniparse ];
doCheck = false; doCheck = false;
dontStrip = true;
postUnpack = '' buildPhase = "";
substituteInPlace $sourceRoot/setup.py \ installPhase = ''
--replace "sharedir = os.path.join(installcmd.install_data[rootlen:], 'share')" "sharedir = '$out/share/'" ${pythonPackages.python.executable} setup.py install --prefix=$out
'';
postInstall = ''
ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias
''; '';