diff options
| author | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2011-10-22 15:41:20 +0000 |
|---|---|---|
| committer | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2011-10-22 15:41:20 +0000 |
| commit | 87bf6373198112dcddbb1dda5de785ff26168f1e (patch) | |
| tree | b3068f44757e3c1db35e6defed4c4714709a07aa /pkgs/applications/version-management/git-and-tools | |
| parent | d91165c3688016634c578b3b29802f32f5527760 (diff) | |
| download | nixpkgs-87bf6373198112dcddbb1dda5de785ff26168f1e.tar nixpkgs-87bf6373198112dcddbb1dda5de785ff26168f1e.tar.gz nixpkgs-87bf6373198112dcddbb1dda5de785ff26168f1e.tar.bz2 nixpkgs-87bf6373198112dcddbb1dda5de785ff26168f1e.tar.lz nixpkgs-87bf6373198112dcddbb1dda5de785ff26168f1e.tar.xz nixpkgs-87bf6373198112dcddbb1dda5de785ff26168f1e.tar.zst nixpkgs-87bf6373198112dcddbb1dda5de785ff26168f1e.zip | |
Mercurial: Give access to ssl and curses python packages for
fast-export and crecord. svn path=/nixpkgs/trunk/; revision=29972
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/fast-export/default.nix | 15 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 153ff2f03e9..6319c3592c6 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -3,7 +3,7 @@ */ args: with args; with pkgs; let - inherit (pkgs) stdenv fetchurl subversion; + inherit (pkgs) stdenv fetchgit fetchurl subversion; in rec { @@ -91,8 +91,7 @@ rec { }; gitFastExport = import ./fast-export { - inherit fetchurl sourceFromHead stdenv mercurial coreutils git makeWrapper - subversion; + inherit fetchgit stdenv mercurial coreutils git makeWrapper subversion; }; git2cl = import ./git2cl { diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index ef633d87ca6..45860362433 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -1,13 +1,14 @@ -args: with args; +{stdenv, fetchgit, mercurial, coreutils, git, makeWrapper, subversion}: + stdenv.mkDerivation { name = "fast-export"; - # REGION AUTO UPDATE: { name="git_fast_export"; type = "git"; url="git://repo.or.cz/hg2git.git"; } - src = sourceFromHead "git_fast_export-1464dabbff7fe42b9069e98869db40276d295ad6.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/git_fast_export-1464dabbff7fe42b9069e98869db40276d295ad6.tar.gz"; sha256 = "c65b8607836794b250f5faeef5ec1bcbf40f0bfaeb39ccb600966deb6a40d755"; }); - # END + src = fetchgit { + url = "git://repo.or.cz/fast-export.git"; + rev = "refs/heads/master"; + }; - buildInputs =([mercurial.python mercurial makeWrapper subversion]); + buildInputs = [mercurial.python mercurial makeWrapper subversion]; buildPhase="true"; # skip svn for now @@ -24,7 +25,7 @@ stdenv.mkDerivation { mv *.py $l for p in $out/bin/*.sh; do 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 done ''; |