JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #35295 from volth/patch-96

Browse Source 
mercurial: 4.3.2 -> 4.5
This commit is contained in:
Franz Pletz 2018-02-23 03:44:57 +00:00 committed by GitHub
commit 7abd3cb134
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/mercurial/default.nix
View File

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

6
pkgs/applications/version-management/tortoisehg/default.nix
View File

@ -2,18 +2,18 @@
python2Packages.buildPythonApplication rec {
name = "tortoisehg-${version}";
version = "4.3.1";
version = "4.5";
src = fetchurl {
url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
sha256 = "0lxppjdqjmwl5y8fmp2am0my7a3mks811yg4fff7cx0569hdp62n";
sha256 = "11m2hir2y1hblg9sqmansv16rcp560j2d3nhqzfhkim46a59fxvk";
};
pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];
propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ];
doCheck = true;
doCheck = false; # tests fail with "thg: cannot connect to X server"
dontStrip = true;
buildPhase = "";
installPhase = ''