Merge pull request #19978 from k0ral/nixos-unstable

mercurial, tortoisehg: 3.9.1 -> 3.9.2
This commit is contained in:
Tim Steinbach 2016-10-29 17:14:45 -04:00 committed by GitHub
commit d8e6f48eee
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.1"; version = "3.9.2";
name = "mercurial-${version}"; name = "mercurial-${version}";
inherit (python2Packages) docutils hg-git dulwich python; inherit (python2Packages) docutils hg-git dulwich python;
in in
@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://mercurial-scm.org/release/${name}.tar.gz"; url = "https://mercurial-scm.org/release/${name}.tar.gz";
sha256 = "0x6zjl8za6nnlbmyxng4pfrr2h77zi3wbg985262ghjyx33lypk2"; sha256 = "1kw3cpcjygfapvi5c123limhpbkmg7is2i81pybk1s05gi16l139";
}; };
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 @@
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
name = "tortoisehg-${version}"; name = "tortoisehg-${version}";
version = "3.9.1"; version = "3.9.2";
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 = "12bqvkkwkb6m5hls7gipkxbnspfrk1k6l9l0fff0wp1zajnp4pnn"; sha256 = "17wcsf91z7dnb7c8vyagasj5vvmas6ms5lx1ny4pnm94qzslkfh2";
}; };
pythonPath = with pythonPackages; [ pyqt4 mercurial qscintilla iniparse ]; pythonPath = with pythonPackages; [ pyqt4 mercurial qscintilla iniparse ];