From 2fce49d3e8218c231aed37926acf987dd3b112df Mon Sep 17 00:00:00 2001 From: danbst Date: Fri, 22 Apr 2016 16:00:43 +0000 Subject: [PATCH] tortoisehg: 3.7.1 -> 3.7.3, refactor update tortoisehg to 3.7.3 and remove source patch in build expression. setup.py in TortoiseHG computes wrong paths in `build` phase (upstream bug https://bitbucket.org/tortoisehg/thg/issues/4483/problems-with-setuppy-on-posix-systems). So we skip this phase and perform install manually (the `build` phase is still performed as subcommand). --- .../version-management/tortoisehg/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 60e713512081..2ba730a04d2e 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,12 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "3.7.1"; - namePrefix = ""; + version = "3.7.3"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "1ycf8knwk1rs99s5caq611sk4c4nzwyzq8g35hw5kwj15b6dl4k6"; + sha256 = "1vahiavpkf9ib2mx8z5i6f0kh072zycazmbrc4sl94p5pvv5w1dh"; }; pythonPath = with pythonPackages; [ pyqt4 mercurial qscintilla iniparse ]; @@ -15,14 +14,11 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ qscintilla iniparse ]; doCheck = false; - - postUnpack = '' - substituteInPlace $sourceRoot/setup.py \ - --replace "sharedir = os.path.join(installcmd.install_data[rootlen:], 'share')" "sharedir = '$out/share/'" - ''; - - postInstall = '' - ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias + dontStrip = true; + buildPhase = ""; + installPhase = '' + ${pythonPackages.python.executable} setup.py install --prefix=$out + ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias ''; meta = {