public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removing old bleeding edge cruft replacing it by a niftier version using

Browse Source 
source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README.

sourceByName is called sourceFromHead now.

updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update

svn path=/nixpkgs/trunk/; revision=18894
This commit is contained in:
Marc Weber
2009-12-11 13:58:23 +00:00
parent 1030a6bb68
commit 5319704f80
28 changed files with 210 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/git-and-tools/default.nix
+8 -8
View File
@@ -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;
};
}
pkgs/applications/version-management/git-and-tools/fast-export/default.nix
+4 -1
View File
@@ -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]);
pkgs/applications/version-management/git-and-tools/git/git-git.nix
+5 -2
View File
@@ -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}
pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix
+5 -2
View File
@@ -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