Merge pull request #104307 from jonringer/fix-mercurial
mercurial: 5.4.2 -> 5.6, fix build
This commit is contained in:
commit
46769c7a77
|
@ -4,26 +4,24 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (python3Packages) docutils dulwich python;
|
inherit (python3Packages) docutils python;
|
||||||
|
|
||||||
in python3Packages.buildPythonApplication rec {
|
in python3Packages.buildPythonApplication rec {
|
||||||
pname = "mercurial";
|
pname = "mercurial";
|
||||||
version = "5.4.2";
|
version = "5.6";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
|
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
|
||||||
sha256 = "0ls8nwx3nz26pibphw54fg8pxqb365zmmqx95lqrxqqyf3d972sw";
|
sha256 = "1hk2y30zzdnlv8f71kabvh0xi9c7qhp28ksh20vpd0r712sv79yz";
|
||||||
};
|
};
|
||||||
|
|
||||||
format = "other";
|
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 ]
|
buildInputs = [ makeWrapper docutils unzip ]
|
||||||
++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ];
|
++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ];
|
||||||
|
|
||||||
propagatedBuildInputs = [ dulwich ];
|
|
||||||
|
|
||||||
makeFlags = [ "PREFIX=$(out)" ];
|
makeFlags = [ "PREFIX=$(out)" ];
|
||||||
|
|
||||||
postInstall = (stdenv.lib.optionalString guiSupport ''
|
postInstall = (stdenv.lib.optionalString guiSupport ''
|
||||||
|
|
Loading…
Reference in New Issue