diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2020-11-19 23:43:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-19 23:43:04 +0100 |
| commit | 46769c7a7784ba925692b83e5f0066f6a978d21a (patch) | |
| tree | add82084438e2bf1c1fedf4a536391f4204127cc /pkgs/applications | |
| parent | bd699cc9a003e5aab27e12de59854e318c432241 (diff) | |
| parent | 81d1cea1c0be2d01a0f1382e3365c5a9b20057f1 (diff) | |
Merge pull request #104307 from jonringer/fix-mercurial
mercurial: 5.4.2 -> 5.6, fix build
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/version-management/mercurial/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index c7a1c4149870..e0400fd46c65 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,26 +4,24 @@ }: let - inherit (python3Packages) docutils dulwich python; + inherit (python3Packages) docutils python; in python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "5.4.2"; + version = "5.6"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "0ls8nwx3nz26pibphw54fg8pxqb365zmmqx95lqrxqqyf3d972sw"; + sha256 = "1hk2y30zzdnlv8f71kabvh0xi9c7qhp28ksh20vpd0r712sv79yz"; }; format = "other"; - inherit python; # pass it so that the same version can be used in hg2git + passthru = { inherit python; }; # pass it so that the same version can be used in hg2git buildInputs = [ makeWrapper docutils unzip ] ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ]; - propagatedBuildInputs = [ dulwich ]; - makeFlags = [ "PREFIX=$(out)" ]; postInstall = (stdenv.lib.optionalString guiSupport '' |