3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #12819 from Beauhurst/hg_crecord_revert

hg_crecord: revert changes adding mercurial crecord
This commit is contained in:
Robin Gloster 2016-02-05 21:24:19 +01:00
commit 5b67ed7c55
3 changed files with 2 additions and 38 deletions

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, makeWrapper, docutils, unzip, hg-git, dulwich
, guiSupport ? false, tk ? null, hg-crecord ? null, curses
, guiSupport ? false, tk ? null, curses
, ApplicationServices, cf-private }:
let
@ -37,13 +37,6 @@ 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

View file

@ -12613,7 +12613,7 @@ let
guiSupport = false; # use mercurialFull to get hgk GUI
};
mercurialFull = appendToName "full" (pkgs.mercurial.override { inherit (pythonPackages) hg-crecord; guiSupport = true; });
mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; });
merkaartor = callPackage ../applications/misc/merkaartor { };

View file

@ -8190,35 +8190,6 @@ in modules // {
};
hg-crecord = buildPythonPackage rec {
rev = "5cfaabfe9cb9f0a0d6837956d73127f290a213be";
name = "hg-crecord-${rev}";
disabled = isPy3k;
src = pkgs.fetchhg {
inherit rev;
url = "https://bitbucket.org/edgimar/crecord";
sha256 = "14x1k5k0jv3fiynpdfyp5zh4qvs4nr6qwy09chv3js3dhs5887ic";
};
# 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";