Merge pull request #24244 from mythmon/mercurial-upgrade

Upgrade mercrial and tortoisehg to 4.1.1
This commit is contained in:
Michael Raskin 2017-04-20 08:34:16 +02:00 committed by GitHub
commit 9c16f669b9
2 changed files with 4 additions and 4 deletions

View File

@ -4,7 +4,7 @@
let let
# if you bump version, update pkgs.tortoisehg too or ping maintainer # if you bump version, update pkgs.tortoisehg too or ping maintainer
version = "3.9.2"; version = "4.1.1";
name = "mercurial-${version}"; name = "mercurial-${version}";
inherit (python2Packages) docutils hg-git dulwich python; inherit (python2Packages) docutils hg-git dulwich python;
in python2Packages.buildPythonApplication { in python2Packages.buildPythonApplication {
@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication {
src = fetchurl { src = fetchurl {
url = "https://mercurial-scm.org/release/${name}.tar.gz"; url = "https://mercurial-scm.org/release/${name}.tar.gz";
sha256 = "1kw3cpcjygfapvi5c123limhpbkmg7is2i81pybk1s05gi16l139"; sha256 = "17imsf4haqgw364p1z9i416jinmfxfia537b84hcg0rg43hinmv3";
}; };
inherit python; # pass it so that the same version can be used in hg2git inherit python; # pass it so that the same version can be used in hg2git

View File

@ -2,11 +2,11 @@
python2Packages.buildPythonApplication rec { python2Packages.buildPythonApplication rec {
name = "tortoisehg-${version}"; name = "tortoisehg-${version}";
version = "3.9.2"; version = "4.1.1";
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 = "17wcsf91z7dnb7c8vyagasj5vvmas6ms5lx1ny4pnm94qzslkfh2"; sha256 = "14fy5p5hx4iij5kyma9679nrprd9lsjr6j047bfyfrwa3l4knj2g";
}; };
pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];