diff options
| author | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-04-22 19:05:56 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-04-22 19:05:56 +0200 |
| commit | f49b9fe9d9086dbdd6a1825fbbef6ba322a8b7cc (patch) | |
| tree | 2d5ce3b222728afa2be40fbe32ccbda0580c526c /pkgs | |
| parent | 42d5aa8c23dbb2e46b46789bc007774b58b55541 (diff) | |
| parent | 2fce49d3e8218c231aed37926acf987dd3b112df (diff) | |
| download | nixlib-f49b9fe9d9086dbdd6a1825fbbef6ba322a8b7cc.tar nixlib-f49b9fe9d9086dbdd6a1825fbbef6ba322a8b7cc.tar.gz nixlib-f49b9fe9d9086dbdd6a1825fbbef6ba322a8b7cc.tar.bz2 nixlib-f49b9fe9d9086dbdd6a1825fbbef6ba322a8b7cc.tar.lz nixlib-f49b9fe9d9086dbdd6a1825fbbef6ba322a8b7cc.tar.xz nixlib-f49b9fe9d9086dbdd6a1825fbbef6ba322a8b7cc.tar.zst nixlib-f49b9fe9d9086dbdd6a1825fbbef6ba322a8b7cc.zip | |
Merge pull request #14892 from danbst/tortoisehg-refactor
tortoisehg: 3.7.1 -> 3.7.3, refactor
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/version-management/mercurial/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/version-management/tortoisehg/default.nix | 18 |
2 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index f44baad4715b..27f0279335de 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -3,6 +3,7 @@ , ApplicationServices, cf-private }: let + # if you bump version, update pkgs.tortoisehg too or ping maintainer version = "3.7.3"; name = "mercurial-${version}"; in 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 = { |