diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-02-23 03:44:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-23 03:44:57 +0000 |
| commit | 7abd3cb134b1cf357b16cb46d6b4fa5c312a8d98 (patch) | |
| tree | 66890dbf495b9f9dfc948497d362d7aa7c055bb6 /pkgs/applications/version-management | |
| parent | 5e21e5360ec40f42f3b63a16e55100775fc8c829 (diff) | |
| parent | 80cc3bd29ac9cafbcc8f255c3e286fc80abaa0fa (diff) | |
| download | nixlib-7abd3cb134b1cf357b16cb46d6b4fa5c312a8d98.tar nixlib-7abd3cb134b1cf357b16cb46d6b4fa5c312a8d98.tar.gz nixlib-7abd3cb134b1cf357b16cb46d6b4fa5c312a8d98.tar.bz2 nixlib-7abd3cb134b1cf357b16cb46d6b4fa5c312a8d98.tar.lz nixlib-7abd3cb134b1cf357b16cb46d6b4fa5c312a8d98.tar.xz nixlib-7abd3cb134b1cf357b16cb46d6b4fa5c312a8d98.tar.zst nixlib-7abd3cb134b1cf357b16cb46d6b4fa5c312a8d98.zip | |
Merge pull request #35295 from volth/patch-96
mercurial: 4.3.2 -> 4.5
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/mercurial/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/version-management/tortoisehg/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 541bc8799a83..68750bb9e6e7 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -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 diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index f06a0c90db14..437062f7f5e1 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -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 = '' |