Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2020-11-20 01:38:32 +01:00
26 changed files with 373 additions and 58 deletions
@@ -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 ''