mercurial: 4.9.1 -> 5.2.1

also switch to python3
This commit is contained in:
Jörg Thalheim 2019-12-21 07:24:51 +00:00
parent 2a60519881
commit 88a473fc12
No known key found for this signature in database
GPG Key ID: B3F5D81B0C6967C4
1 changed files with 35 additions and 39 deletions

View File

@ -1,21 +1,19 @@
{ stdenv, fetchurl, python2Packages, makeWrapper, unzip { stdenv, fetchurl, python3Packages, makeWrapper, unzip
, guiSupport ? false, tk ? null , guiSupport ? false, tk ? null
, ApplicationServices , ApplicationServices
, mercurialSrc ? fetchurl rec {
meta.name = "mercurial-${meta.version}";
meta.version = "4.9.1";
url = "https://mercurial-scm.org/release/${meta.name}.tar.gz";
sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v";
}
}: }:
let let
inherit (python2Packages) docutils hg-git dulwich python; inherit (python3Packages) docutils dulwich python;
in python2Packages.buildPythonApplication { in python3Packages.buildPythonApplication rec {
pname = "mercurial";
version = "5.2.1";
inherit (mercurialSrc.meta) name version; src = fetchurl {
src = mercurialSrc; url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "1pxkd37b0a1mi2zakk1hi122lgz1ffy2fxdnbs8acwlqpw55bc8q";
};
format = "other"; format = "other";
@ -24,12 +22,11 @@ in python2Packages.buildPythonApplication {
buildInputs = [ makeWrapper docutils unzip ] buildInputs = [ makeWrapper docutils unzip ]
++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ]; ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ];
propagatedBuildInputs = [ hg-git dulwich ]; propagatedBuildInputs = [ dulwich ];
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];
postInstall = (stdenv.lib.optionalString guiSupport postInstall = (stdenv.lib.optionalString guiSupport ''
''
mkdir -p $out/etc/mercurial mkdir -p $out/etc/mercurial
cp contrib/hgk $out/bin cp contrib/hgk $out/bin
cat >> $out/etc/mercurial/hgrc << EOF cat >> $out/etc/mercurial/hgrc << EOF
@ -40,8 +37,7 @@ in python2Packages.buildPythonApplication {
WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix} WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix}
--set HG $out/bin/hg --set HG $out/bin/hg
--prefix PATH : ${tk}/bin " --prefix PATH : ${tk}/bin "
'') + '') + ''
''
for i in $(cd $out/bin && ls); do for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \ wrapProgram $out/bin/$i \
$WRAP_TK $WRAP_TK
@ -58,7 +54,7 @@ in python2Packages.buildPythonApplication {
''; '';
meta = { meta = {
inherit (mercurialSrc.meta) version; inherit version;
description = "A fast, lightweight SCM system for very large distributed projects"; description = "A fast, lightweight SCM system for very large distributed projects";
homepage = https://www.mercurial-scm.org; homepage = https://www.mercurial-scm.org;
downloadPage = https://www.mercurial-scm.org/release/; downloadPage = https://www.mercurial-scm.org/release/;