diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 0557b8a2c55e..d69291293204 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2276b176cad..70e104cc15f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12615,7 +12615,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 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b6757094e896..8248f71339aa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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";