Merge pull request #10037 from Beauhurst/hg_crecord
mercurial: add package for crecord extension as optional dependency, …
This commit is contained in:
commit
01aa6a68ac
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, python, makeWrapper, docutils, unzip, hg-git, dulwich
|
||||
, guiSupport ? false, tk ? null, curses
|
||||
, guiSupport ? false, tk ? null, hg-crecord ? null, curses
|
||||
, ApplicationServices }:
|
||||
|
||||
let
|
||||
|
@ -36,6 +36,13 @@ stdenv.mkDerivation {
|
|||
WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/${tk.libPrefix}\"
|
||||
--set HG \"$out/bin/hg\"
|
||||
--prefix PATH : \"${tk}/bin\" "
|
||||
'') + (stdenv.lib.optionalString (hg-crecord != null)
|
||||
''
|
||||
mkdir -p $out/etc/mercurial
|
||||
cat >> $out/etc/mercurial/hgrc << EOF
|
||||
[extensions]
|
||||
crecord=${hg-crecord}/${python.sitePackages}/crecord
|
||||
EOF
|
||||
'') +
|
||||
''
|
||||
for i in $(cd $out/bin && ls); do
|
||||
|
|
|
@ -11935,7 +11935,7 @@ let
|
|||
guiSupport = false; # use mercurialFull to get hgk GUI
|
||||
};
|
||||
|
||||
mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; });
|
||||
mercurialFull = appendToName "full" (pkgs.mercurial.override { inherit (pythonPackages) hg-crecord; guiSupport = true; });
|
||||
|
||||
merkaartor = callPackage ../applications/misc/merkaartor { };
|
||||
|
||||
|
|
|
@ -5720,6 +5720,34 @@ let
|
|||
};
|
||||
|
||||
|
||||
hg-crecord = buildPythonPackage rec {
|
||||
rev = "5cfaabfe9cb9f0a0d6837956d73127f290a213be";
|
||||
name = "hg-crecord-${rev}";
|
||||
disabled = isPy3k;
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://bitbucket.org/edgimar/crecord/get/${builtins.substring 0 12 rev}.tar.gz";
|
||||
sha256 = "02003fa5620ec40a5ad0d7cede2e65c2cb398a7fe4e1ee26bd3396a87d63ad35";
|
||||
};
|
||||
|
||||
# crecord comes as just a bare directory
|
||||
configurePhase = " ";
|
||||
buildPhase = "${python.executable} -m compileall crecord";
|
||||
installPhase = ''
|
||||
mkdir -p $out/${python.sitePackages}
|
||||
cp -Lr crecord $out/${python.sitePackages}/
|
||||
'';
|
||||
|
||||
# there ain't none
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Mercurial extension for selecting graphically which files/hunk/lines to commit";
|
||||
homepage = https://bitbucket.org/edgimar/crecord;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
docutils = buildPythonPackage rec {
|
||||
name = "docutils-0.12";
|
||||
|
||||
|
|
Loading…
Reference in a new issue