Author: NicolasPierron
Date: Sat Oct 22 15:41:20 2011
New Revision: 29972
URL: https://nixos.org/websvn/nix/?rev=29972&sc=1
Log:
Mercurial: Give access to ssl and curses python packages for
fast-export and crecord.
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
nixpkgs/trunk/pkgs/applications/version-management/mercurial/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Sat Oct 22 00:01:26 2011 (r29971)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Sat Oct 22 15:41:20 2011 (r29972)
@@ -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 @@
};
gitFastExport = import ./fast-export {
- inherit fetchurl sourceFromHead stdenv mercurial coreutils git makeWrapper
- subversion;
+ inherit fetchgit stdenv mercurial coreutils git makeWrapper subversion;
};
git2cl = import ./git2cl {
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
Sat Oct 22 00:01:26 2011 (r29971)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
Sat Oct 22 15:41:20 2011 (r29972)
@@ -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 @@
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
'';
Modified:
nixpkgs/trunk/pkgs/applications/version-management/mercurial/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/version-management/mercurial/default.nix
Sat Oct 22 00:01:26 2011 (r29971)
+++ nixpkgs/trunk/pkgs/applications/version-management/mercurial/default.nix
Sat Oct 22 15:41:20 2011 (r29972)
@@ -1,15 +1,16 @@
{ stdenv, fetchurl, python, makeWrapper, docutils
-, guiSupport ? false, tk ? null, ssl }:
+, guiSupport ? false, tk ? null, ssl, curses }:
stdenv.mkDerivation rec {
- name = "mercurial-1.9";
+ name = "mercurial-1.9.2";
src = fetchurl {
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
+ pythonPackages = [ ssl curses ];
buildInputs = [ python makeWrapper docutils ];
@@ -31,7 +32,7 @@
''
for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \
- --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl}")" \
+ --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl} ${curses}")" \
$WRAP_TK
done
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Oct 22 00:01:26
2011 (r29971)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Oct 22 15:41:20
2011 (r29972)
@@ -7025,7 +7025,11 @@
mercurial = callPackage ../applications/version-management/mercurial {
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 { };
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
