From ea22df581b684bd4300a75ba527e54209aaedd56 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sat, 18 Oct 2008 21:08:42 +0000 Subject: [PATCH] added hg2git svn path=/nixpkgs/trunk/; revision=13096 --- .../version-management/mercurial/default.nix | 2 ++ .../misc/bleeding-edge-repos/default.nix | 2 ++ pkgs/misc/bleeding-edge-fetch-infos.nix | 4 +++ pkgs/tools/misc/hg2git/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 5 files changed, 39 insertions(+) create mode 100644 pkgs/tools/misc/hg2git/default.nix diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 7ba7262f720..836232a688b 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -7,6 +7,8 @@ stdenv.mkDerivation { sha256 = "0fj2aakband855684q76h7zl328iq8i6l81c2k64hy5m0if9hvgr"; }; + inherit python; # pass it so that the same version can be used in hg2git + buildInputs = [ python makeWrapper ]; makeFlags = "PREFIX=$(out)"; postInstall = (if args.guiSupport then diff --git a/pkgs/development/misc/bleeding-edge-repos/default.nix b/pkgs/development/misc/bleeding-edge-repos/default.nix index 9635e0b2aeb..dade5b3e94b 100644 --- a/pkgs/development/misc/bleeding-edge-repos/default.nix +++ b/pkgs/development/misc/bleeding-edge-repos/default.nix @@ -37,6 +37,8 @@ args: plugins = { type = "darcs"; url="http://code.haskell.org/~dons/code/hs-plugins/"; groups="haskell"; }; + hg2git = { type = "git"; url="git://repo.or.cz/hg2git.git"; }; + # darcs repositories haskell http = { type= "darcs"; url="http://darcs.haskell.org/http/"; groups="happs"; }; syb_with_class = { type="darcs"; url="http://happs.org/HAppS/syb-with-class"; groups="happs"; }; diff --git a/pkgs/misc/bleeding-edge-fetch-infos.nix b/pkgs/misc/bleeding-edge-fetch-infos.nix index 11d75c10fce..339c487562e 100644 --- a/pkgs/misc/bleeding-edge-fetch-infos.nix +++ b/pkgs/misc/bleeding-edge-fetch-infos.nix @@ -219,4 +219,8 @@ url = "http://mawercer.de/~nix/repos/cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"; sha256 = "1e84ff59dcd7a3c80343eb9be302f822e510c95398fd1a6c8f2e4b163fd51e45"; }; + hg2git = args: with args; fetchurl { # Sat Oct 18 21:02:44 UTC 2008 + url = "http://mawercer.de/~nix/repos/hg2git-4c77e121b739d2aac8a23352503763343823f870.tar.gz"; + sha256 = "22354d36937bf9e5d3e3dfc1a3ef9e3f2bc183b8e114a23958a2b10f83abc97e"; + }; } diff --git a/pkgs/tools/misc/hg2git/default.nix b/pkgs/tools/misc/hg2git/default.nix new file mode 100644 index 00000000000..291391b6719 --- /dev/null +++ b/pkgs/tools/misc/hg2git/default.nix @@ -0,0 +1,26 @@ +args: with args; +stdenv.mkDerivation { + name = "hg2git"; + + src = sourceByName "hg2git"; + + buildInputs =([mercurial.python mercurial makeWrapper]); + + installPhase = '' + ensureDir $out/bin; + cp hg2git.sh hg2git.py $out/bin + cat >> $out/bin/hg2git-doc << EOF + #!${coreutils}/bin/cat + $(cat hg2git.txt) + EOF + chmod +x $out/bin/hg2git-doc + wrapProgram $out/bin/hg2git.sh \ + --set PYTHONPATH "$(echo ${mercurial}/lib/python*/site-packages)" + ''; + + meta = { + description = "mercurial to git one way conversion"; + homepage = "http://git.grml.org/?p=hg-to-git.git;a=summary"; + license = "?"; # the .py file is GPLv2 + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42f8a8557c5..40ca716833d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -833,6 +833,11 @@ let inherit fetchurl stdenv ocaml; }; + hg2git = import ../tools/misc/hg2git { + inherit fetchurl stdenv mercurial coreutils git makeWrapper; + inherit (bleedingEdgeRepos) sourceByName; + }; + highlight = builderDefsPackage (selectVersion ../tools/text/highlight "2.6.10") { inherit getopt; };