diff options
Diffstat (limited to 'pkgs/applications/version-management')
4 files changed, 22 insertions, 13 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index a1e8cb903f6..1f5e78bca13 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -4,7 +4,6 @@ args: with args; with pkgs; let inherit (pkgs) stdenv fetchurl getConfig subversion; - inherit (pkgs.bleedingEdgeRepos) sourceByName; in rec { @@ -19,11 +18,10 @@ rec { }; gitGit = import ./git/git-git.nix { - inherit fetchurl stdenv curl openssl zlib expat perl gettext + inherit fetchurl sourceFromHead stdenv curl openssl zlib expat perl gettext asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl tk makeWrapper subversion autoconf; - inherit (bleedingEdgeRepos) sourceByName; svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support guiSupport = getConfig ["git" "guiSupport"] false; perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion]; @@ -36,9 +34,8 @@ rec { }; qgitGit = import ./qgit/qgit-git.nix { - inherit fetchurl stdenv; + inherit fetchurl sourceFromHead stdenv; inherit (xlibs) libXext libX11; - inherit (bleedingEdgeRepos) sourceByName; qt = qt4; }; @@ -49,7 +46,10 @@ rec { topGit = stdenv.mkDerivation { name = "TopGit-git"; # official release 0.8 - src = sourceByName "topGit"; # destination directory is patched + # REGION AUTO UPDATE: { name = "topGit"; type="git"; url="http://repo.or.cz/w/topgit.git"; } + src = sourceFromHead "topGit-f59e4f9e87e5f485fdaee0af002edd2105fa298a.tar.gz" + (fetchurl { url = "http://mawercer.de/~nix/repos/topGit-f59e4f9e87e5f485fdaee0af002edd2105fa298a.tar.gz"; sha256 = "12aa6d34c82d505066b851e24069fe9d6930d70913b7d94a0cc6e8f06f127170"; }); + # END phases="unpackPhase patchPhase installPhase"; installPhase = '' mkdir -p $out/etc/bash_completion.d @@ -84,8 +84,8 @@ rec { }; gitFastExport = import ./fast-export { - inherit fetchurl stdenv mercurial coreutils git makeWrapper subversion; - inherit (bleedingEdgeRepos) sourceByName; + inherit fetchurl sourceFromHead stdenv mercurial coreutils git makeWrapper + subversion; }; } 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 2c1b055f311..aa942f5e8d7 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 @@ -2,7 +2,10 @@ args: with args; stdenv.mkDerivation { name = "fast-export"; - src = sourceByName "git_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 = "0808bafddce07c8f3dc2116f2c33e56f5589927630e0b72219e64d8a6c8c0023"; }); + # END buildInputs =([mercurial.python mercurial makeWrapper subversion]); diff --git a/pkgs/applications/version-management/git-and-tools/git/git-git.nix b/pkgs/applications/version-management/git-and-tools/git/git-git.nix index 3a0e3aa9fa8..0e4efa26fd3 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-git.nix +++ b/pkgs/applications/version-management/git-and-tools/git/git-git.nix @@ -3,7 +3,7 @@ , libxslt, tcl, tk, makeWrapper , svnSupport, subversion, perlLibs , guiSupport -, sourceByName +, sourceFromHead , autoconf }: @@ -18,7 +18,10 @@ stdenv.mkDerivation rec { # contact marco-oweber@gmx.de if you want to know more details name = "git-git-with-glob-patch"; - src = sourceByName "git"; + # REGION AUTO UPDATE: { name="git"; type="git"; url="git://git.kernel.org/pub/scm/git/git.git"; } + src = sourceFromHead "git-8b43d378dff4d490165dbac05a0bf5da2011bfa5.tar.gz" + (fetchurl { url = "http://mawercer.de/~nix/repos/git-8b43d378dff4d490165dbac05a0bf5da2011bfa5.tar.gz"; sha256 = "a910bbac05c6e349a0bcfd9a27f7045916e5d07dc4acb4baf6d92475c30e28dc"; }); + # END patchePhase = '' patch -p1 < ${./docbook2texi-2.patch} diff --git a/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix b/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix index b794b34052c..c3b3469ca1a 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt, libXext, libX11, sourceByName}: +{stdenv, fetchurl, qt, libXext, libX11, sourceFromHead}: stdenv.mkDerivation rec { name = "qgit-git"; @@ -8,7 +8,10 @@ stdenv.mkDerivation rec { homepage = "http://digilander.libero.it/mcostalba/"; description = "Graphical front-end to Git"; }; - src = sourceByName "qgit"; + # REGION AUTO UPDATE: { name="qgit"; type="git"; url="git://git.kernel.org/pub/scm/qgit/qgit4.git"; } + src = sourceFromHead "qgit-a0252ed2a6a72b50e65d027adce8afa22e874277.tar.gz" + (fetchurl { url = "http://mawercer.de/~nix/repos/qgit-a0252ed2a6a72b50e65d027adce8afa22e874277.tar.gz"; sha256 = "17e4727ac68b4f2e8503289d5b6a2c042547e7be133e7f8195b79e33eab61b93"; }); + # END buildInputs = [qt libXext libX11]; buildPhase = '' qmake PREFIX=$out |