diff options
author | Peter Simons <simons@cryp.to> | 2015-06-24 11:30:59 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2015-06-24 11:33:17 +0200 |
commit | 922c5550154a3d6c518279835161757cc1c3a941 (patch) | |
tree | 54dc395f1b0e7a5149464995b7ea84866ece0568 | |
parent | c112c3f51feb677ae268ad53255288d57a32f843 (diff) | |
download | nixlib-922c5550154a3d6c518279835161757cc1c3a941.tar nixlib-922c5550154a3d6c518279835161757cc1c3a941.tar.gz nixlib-922c5550154a3d6c518279835161757cc1c3a941.tar.bz2 nixlib-922c5550154a3d6c518279835161757cc1c3a941.tar.lz nixlib-922c5550154a3d6c518279835161757cc1c3a941.tar.xz nixlib-922c5550154a3d6c518279835161757cc1c3a941.tar.zst nixlib-922c5550154a3d6c518279835161757cc1c3a941.zip |
mercurial: add hg-git support
Enable this feature by putting these lines into your ~/.hgrc file: [extensions] hgext.bookmarks = hggit =
-rw-r--r-- | pkgs/applications/version-management/mercurial/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 565c95af5081..2db8cf72350a 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, makeWrapper, docutils, unzip +{ stdenv, fetchurl, python, makeWrapper, docutils, unzip, hg-git, dulwich , guiSupport ? false, tk ? null, curses, cacert }: let @@ -37,7 +37,7 @@ stdenv.mkDerivation { '' for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ - --prefix PYTHONPATH : "$(toPythonPath "$out ${curses}")" \ + --prefix PYTHONPATH : "$(toPythonPath "$out ${curses}"):$(toPythonPath "$out ${hg-git}"):$(toPythonPath "$out ${dulwich}")" \ $WRAP_TK done diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efd2257ce573..26a7fbe3377b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11833,7 +11833,7 @@ let mendeley = callPackage ../applications/office/mendeley { }; mercurial = callPackage ../applications/version-management/mercurial { - inherit (pythonPackages) curses docutils; + inherit (pythonPackages) curses docutils hg-git dulwich; guiSupport = false; # use mercurialFull to get hgk GUI }; |