switch mercurial_4 and tortoisehg to pname

This commit is contained in:
Artturin 2021-07-01 07:06:41 +03:00
parent 5ec78c03ce
commit d8a87e89e7
2 changed files with 17 additions and 23 deletions

View file

@ -1,21 +1,19 @@
{ lib, stdenv, fetchurl, python2Packages, makeWrapper
, guiSupport ? false, tk ? null
, 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
inherit (python2Packages) docutils hg-git dulwich python;
in python2Packages.buildPythonApplication {
in python2Packages.buildPythonApplication rec {
pname = "mercurial";
version = "4.9.1";
inherit (mercurialSrc.meta) name version;
src = mercurialSrc;
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v";
};
format = "other";
@ -59,7 +57,6 @@ in python2Packages.buildPythonApplication {
'';
meta = {
inherit (mercurialSrc.meta) version;
description = "A fast, lightweight SCM system for very large distributed projects";
homepage = "https://www.mercurial-scm.org";
downloadPage = "https://www.mercurial-scm.org/release/";
@ -69,4 +66,3 @@ in python2Packages.buildPythonApplication {
platforms = lib.platforms.unix;
};
}

View file

@ -1,20 +1,18 @@
{ lib, fetchurl, python3Packages
, mercurial, qt5
}:
let
tortoisehgSrc = fetchurl rec {
meta.name = "tortoisehg-${meta.version}";
meta.version = "5.8";
url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${meta.version}.tar.gz";
sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3";
};
# Extension point for when thg's mercurial is lagging behind mainline.
tortoiseMercurial = mercurial;
python3Packages.buildPythonApplication rec {
pname = "tortoisehg";
version = "5.8";
in python3Packages.buildPythonApplication {
inherit (tortoisehgSrc.meta) name version;
src = tortoisehgSrc;
src = fetchurl {
url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz";
sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3";
};
# Extension point for when thg's mercurial is lagging behind mainline.
tortoiseMercurial = mercurial;
propagatedBuildInputs = with python3Packages; [
tortoiseMercurial qscintilla-qt5 iniparse