mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
tortoisehg: 5.0.2 -> 5.2.1
This version is not yet released. However given that python2 will soon go end-of-life (without security updates), this seems like a good move. The package was also lacking proper qt wrapping and unusable before.
This commit is contained in:
parent
001999e25b
commit
7063f6f29a
@ -1,43 +1,38 @@
|
|||||||
{ lib, fetchurl, python2Packages
|
{ lib, fetchurl, python3Packages
|
||||||
, mercurial
|
, mercurial, qt5
|
||||||
}@args:
|
}@args:
|
||||||
let
|
let
|
||||||
tortoisehgSrc = fetchurl rec {
|
tortoisehgSrc = fetchurl rec {
|
||||||
meta.name = "tortoisehg-${meta.version}";
|
meta.name = "tortoisehg-${meta.version}";
|
||||||
meta.version = "5.0.2";
|
meta.version = "5.2.1";
|
||||||
url = "https://bitbucket.org/tortoisehg/targz/downloads/${meta.name}.tar.gz";
|
url = "https://bitbucket.org/tortoisehg/thg/get/14221e991a5b623e0072d3bd340b759dbe9072ca.tar.gz";
|
||||||
sha256 = "1fkawx4ymaacah2wpv2w7rxmv1mx08mg4x4r4fxh41jz1njjb8sz";
|
sha256 = "01rpzf5z99izcdda1ps9bhqvhw6qghagd8c1y7x19rv223zi05dv";
|
||||||
};
|
};
|
||||||
|
|
||||||
mercurial =
|
tortoiseMercurial = mercurial.overridePythonAttrs (old: rec {
|
||||||
if args.mercurial.meta.version == tortoisehgSrc.meta.version
|
inherit (tortoisehgSrc.meta) version;
|
||||||
then args.mercurial
|
src = fetchurl {
|
||||||
else args.mercurial.override {
|
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
|
||||||
mercurialSrc = fetchurl rec {
|
sha256 = "1pxkd37b0a1mi2zakk1hi122lgz1ffy2fxdnbs8acwlqpw55bc8q";
|
||||||
meta.name = "mercurial-${meta.version}";
|
};
|
||||||
meta.version = tortoisehgSrc.meta.version;
|
});
|
||||||
url = "https://mercurial-scm.org/release/${meta.name}.tar.gz";
|
|
||||||
sha256 = "1y60hfc8gh4ha9sw650qs7hndqmvbn0qxpmqwpn4q18z5xwm1f19";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
in python2Packages.buildPythonApplication {
|
|
||||||
|
|
||||||
|
in python3Packages.buildPythonApplication {
|
||||||
inherit (tortoisehgSrc.meta) name version;
|
inherit (tortoisehgSrc.meta) name version;
|
||||||
src = tortoisehgSrc;
|
src = tortoisehgSrc;
|
||||||
|
|
||||||
pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];
|
propagatedBuildInputs = with python3Packages; [
|
||||||
|
tortoiseMercurial qscintilla-qt5 iniparse
|
||||||
propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ];
|
];
|
||||||
|
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
|
||||||
|
|
||||||
doCheck = false; # tests fail with "thg: cannot connect to X server"
|
doCheck = false; # tests fail with "thg: cannot connect to X server"
|
||||||
dontStrip = true;
|
postInstall = ''
|
||||||
buildPhase = "";
|
|
||||||
installPhase = ''
|
|
||||||
${python2Packages.python.executable} setup.py install --prefix=$out
|
|
||||||
mkdir -p $out/share/doc/tortoisehg
|
mkdir -p $out/share/doc/tortoisehg
|
||||||
cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt.gz
|
cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt
|
||||||
ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias
|
# convenient alias
|
||||||
|
ln -s $out/bin/thg $out/bin/tortoisehg
|
||||||
|
wrapQtApp $out/bin/thg
|
||||||
'';
|
'';
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
@ -45,7 +40,7 @@ in python2Packages.buildPythonApplication {
|
|||||||
$out/bin/thg version
|
$out/bin/thg version
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru.mercurial = mercurial;
|
passthru.mercurial = tortoiseMercurial;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Qt based graphical tool for working with Mercurial";
|
description = "Qt based graphical tool for working with Mercurial";
|
||||||
|
Loading…
Reference in New Issue
Block a user