Merge pull request #35295 from volth/patch-96

mercurial: 4.3.2 -> 4.5

authored by Franz Pletz and committed by GitHub 7abd3cb1 5e21e536

+5 -5
+2 -2
pkgs/applications/version-management/mercurial/default.nix
··· 4 5 let 6 # if you bump version, update pkgs.tortoisehg too or ping maintainer 7 - version = "4.3.2"; 8 name = "mercurial-${version}"; 9 inherit (python2Packages) docutils hg-git dulwich python; 10 in python2Packages.buildPythonApplication { ··· 13 14 src = fetchurl { 15 url = "https://mercurial-scm.org/release/${name}.tar.gz"; 16 - sha256 = "0j6djq584rcj9ghz59ddqzrfq49lykg3wqwap5fnzp9apa4gcnqg"; 17 }; 18 19 inherit python; # pass it so that the same version can be used in hg2git
··· 4 5 let 6 # if you bump version, update pkgs.tortoisehg too or ping maintainer 7 + version = "4.5"; 8 name = "mercurial-${version}"; 9 inherit (python2Packages) docutils hg-git dulwich python; 10 in python2Packages.buildPythonApplication { ··· 13 14 src = fetchurl { 15 url = "https://mercurial-scm.org/release/${name}.tar.gz"; 16 + sha256 = "0rgjy42zdlbzgp4qq49amzplfcvycyijf4kdhc5wk3fqz7cki4sd"; 17 }; 18 19 inherit python; # pass it so that the same version can be used in hg2git
+3 -3
pkgs/applications/version-management/tortoisehg/default.nix
··· 2 3 python2Packages.buildPythonApplication rec { 4 name = "tortoisehg-${version}"; 5 - version = "4.3.1"; 6 7 src = fetchurl { 8 url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; 9 - sha256 = "0lxppjdqjmwl5y8fmp2am0my7a3mks811yg4fff7cx0569hdp62n"; 10 }; 11 12 pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; 13 14 propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ]; 15 16 - doCheck = true; 17 dontStrip = true; 18 buildPhase = ""; 19 installPhase = ''
··· 2 3 python2Packages.buildPythonApplication rec { 4 name = "tortoisehg-${version}"; 5 + version = "4.5"; 6 7 src = fetchurl { 8 url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; 9 + sha256 = "11m2hir2y1hblg9sqmansv16rcp560j2d3nhqzfhkim46a59fxvk"; 10 }; 11 12 pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; 13 14 propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ]; 15 16 + doCheck = false; # tests fail with "thg: cannot connect to X server" 17 dontStrip = true; 18 buildPhase = ""; 19 installPhase = ''