diff options
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
4 files changed, 18 insertions, 19 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 7513a7adbc78..6319c3592c66 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 { @@ -48,8 +48,7 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which; inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc - HTTP testpack monadControl hS3 mtl network hslogger hxt json; - QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1; + HTTP testpack monadControl hS3 mtl network hslogger hxt json QuickCheck2; }; qgit = import ./qgit { @@ -92,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 ef633d87ca63..45860362433f 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 ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 848214b0fb9b..5fdf9f43bb16 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -4,14 +4,14 @@ }: let - version = "3.20110915"; + version = "3.20111011"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz"; - sha256 = "d16c305c82b151ef6ce0c5cfa52a119240b66e02424aefc15a1f67392f976d47"; + sha256 = "6bfd8ff6784d309bc20aaae38b0edd8f71ed44255b584093a881153d8a70c01c"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 1491b6f74178..eb5daae67e26 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -8,15 +8,15 @@ }: let + version = "1.7.7"; svn = subversionClient.override { perlBindings = true; }; in - -stdenv.mkDerivation rec { - name = "git-1.7.6"; +stdenv.mkDerivation { + name = "git-${version}"; src = fetchurl { - url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; - sha256 = "778795cece63cd758192378f3a999870cea290181b3a4c9de573c77192561082"; + url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; + sha256 = "1xkpyd6mff4m8kmk4vkwi7snr2ff2nmrmsa5hf9bk2a93v07p5ss"; }; patches = [ ./docbook2texi.patch ]; |