diff options
author | Dan Connolly <dckc@madmode.com> | 2016-02-27 18:08:56 -0600 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-04-11 10:35:31 +0200 |
commit | a4ce0e233b086845324f6b4d38ce3a408612a8d7 (patch) | |
tree | f3778ad94216440bd84fec3d70f19e6fef468d9b /pkgs/applications/version-management/tortoisehg | |
parent | 9c484f29cebebfdeccbc4f535f2bcd061d06fed0 (diff) |
tortoisehg: 3.6 -> 3.7.1, fixes package
fixes #13507
On June 8 (e8655ee) tortoisehg changed the way
it computes the `/usr/share` directory in a way that
invalidated the assumptions behind the use
of substituteInPlace in postUnpack.
Diffstat (limited to 'pkgs/applications/version-management/tortoisehg')
-rw-r--r-- | pkgs/applications/version-management/tortoisehg/default.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index ec20122d0ce8..60e713512081 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -1,25 +1,24 @@ -{ pkgs, lib, mercurial, pyPackages ? pkgs.python27Packages }: +{lib, fetchurl, mercurial, pythonPackages}: -pkgs.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "3.6"; + version = "3.7.1"; namePrefix = ""; - src = pkgs.fetchurl { + src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "ec43d13f029bb23a12129d2a2c3b3b4daf3d8121cbb5c9c23e4872f7b0b75ad8"; + sha256 = "1ycf8knwk1rs99s5caq611sk4c4nzwyzq8g35hw5kwj15b6dl4k6"; }; - pythonPath = [ pkgs.pyqt4 mercurial ] - ++ (with pyPackages; [qscintilla iniparse]); + pythonPath = with pythonPackages; [ pyqt4 mercurial qscintilla iniparse ]; - propagatedBuildInputs = with pyPackages; [ qscintilla iniparse ]; + propagatedBuildInputs = with pythonPackages; [ qscintilla iniparse ]; doCheck = false; postUnpack = '' substituteInPlace $sourceRoot/setup.py \ - --replace "/usr/share/" "$out/share/" + --replace "sharedir = os.path.join(installcmd.install_data[rootlen:], 'share')" "sharedir = '$out/share/'" ''; postInstall = '' |