public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mercurial: Give access to ssl and curses python packages for

Browse Source 
fast-export and crecord.

svn path=/nixpkgs/trunk/; revision=29972
This commit is contained in:
Nicolas Pierron 2011-10-22 15:41:20 +00:00
parent d91165c368
commit 87bf637319
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -3,7 +3,7 @@
*/ */
args: with args; with pkgs; args: with args; with pkgs;
let let
inherit (pkgs) stdenv fetchurl subversion; inherit (pkgs) stdenv fetchgit fetchurl subversion;
in in
rec { rec {
@ -91,8 +91,7 @@ rec {
}; };
gitFastExport = import ./fast-export { gitFastExport = import ./fast-export {
inherit fetchurl sourceFromHead stdenv mercurial coreutils git makeWrapper inherit fetchgit stdenv mercurial coreutils git makeWrapper subversion;
subversion;
}; };
git2cl = import ./git2cl { git2cl = import ./git2cl {

15
pkgs/applications/version-management/git-and-tools/fast-export/default.nix
View File

@ -1,13 +1,14 @@
args: with args; {stdenv, fetchgit, mercurial, coreutils, git, makeWrapper, subversion}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "fast-export"; name = "fast-export";
# REGION AUTO UPDATE: { name="git_fast_export"; type = "git"; url="git://repo.or.cz/hg2git.git"; } src = fetchgit {
src = sourceFromHead "git_fast_export-1464dabbff7fe42b9069e98869db40276d295ad6.tar.gz" url = "git://repo.or.cz/fast-export.git";
(fetchurl { url = "http://mawercer.de/~nix/repos/git_fast_export-1464dabbff7fe42b9069e98869db40276d295ad6.tar.gz"; sha256 = "c65b8607836794b250f5faeef5ec1bcbf40f0bfaeb39ccb600966deb6a40d755"; }); rev = "refs/heads/master";
# END };
buildInputs =([mercurial.python mercurial makeWrapper subversion]); buildInputs = [mercurial.python mercurial makeWrapper subversion];
buildPhase="true"; # skip svn for now buildPhase="true"; # skip svn for now
@ -24,7 +25,7 @@ stdenv.mkDerivation {
mv *.py $l mv *.py $l
for p in $out/bin/*.sh; do for p in $out/bin/*.sh; do
wrapProgram $p \ wrapProgram $p \
--set PYTHONPATH "$(echo ${mercurial}/lib/python*/site-packages)" \ --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages}" \
--prefix PATH : "$(dirname $(type -p python))":$l --prefix PATH : "$(dirname $(type -p python))":$l
done done
''; '';

9
pkgs/applications/version-management/mercurial/default.nix
View File

@ -1,15 +1,16 @@
{ stdenv, fetchurl, python, makeWrapper, docutils { stdenv, fetchurl, python, makeWrapper, docutils
, guiSupport ? false, tk ? null, ssl }: , guiSupport ? false, tk ? null, ssl, curses }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mercurial-1.9"; name = "mercurial-1.9.2";
src = fetchurl { src = fetchurl {
url = "http://mercurial.selenic.com/release/${name}.tar.gz"; url = "http://mercurial.selenic.com/release/${name}.tar.gz";
sha256 = "1q1307rv5cyv7qalwkampy1h2f92j4d46v4x9647ljljs8f4n7ki"; sha256 = "481309264d8528a871aab013068c48fa3a6072b016a4095a22230cfdfb8bb9aa";
}; };
inherit python; # pass it so that the same version can be used in hg2git inherit python; # pass it so that the same version can be used in hg2git
pythonPackages = [ ssl curses ];
buildInputs = [ python makeWrapper docutils ]; buildInputs = [ python makeWrapper docutils ];
@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
'' ''
for i in $(cd $out/bin && ls); do for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \ wrapProgram $out/bin/$i \
--prefix PYTHONPATH : "$(toPythonPath "$out ${ssl}")" \ --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl} ${curses}")" \
$WRAP_TK $WRAP_TK
done done

6
pkgs/top-level/all-packages.nix
View File

@ -7025,7 +7025,11 @@ let
mercurial = callPackage ../applications/version-management/mercurial { mercurial = callPackage ../applications/version-management/mercurial {
guiSupport = getConfig ["mercurial" "guiSupport"] false; # for hgk (gitk gui for hg) guiSupport = getConfig ["mercurial" "guiSupport"] false; # for hgk (gitk gui for hg)
inherit (pythonPackages) ssl; inherit (pythonPackages) ssl curses;
# when used with hg-fast-export (git) mercurials files are using
# httplib.FakeSocket which is not provided after python 2.6. (httplib2
# has removed it from its interface).
python = python27;
}; };
merkaartor = callPackage ../applications/misc/merkaartor { }; merkaartor = callPackage ../applications/misc/merkaartor { };