Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates ... Conflict in kerberos, which was updated both in master and in stdenv-updates. Kept the stdenv-updates version, except pulled in the enableParallelBuilding change from master. Signed-off-by: Shea Levy <shea@shealevy.com> Conflicts: pkgs/development/libraries/kerberos/krb5.nix		2013-05-04 18:28:48 -04:00
..
darcs-to-git	darcs-to-git: Remove propagatedBuildInputs.	2012-09-17 06:35:49 +02:00
fast-export	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
git	Merge branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04:00
git-annex	git-annex: update to version 4.20130501	2013-05-03 11:38:58 +02:00
git-bz	Add git-bz nix expression.	2012-04-15 23:48:16 +00:00
git-subtree	git-subtree: updated to version 0.4-2-g2793ee6	2011-09-18 14:56:46 +00:00
git2cl	git2cl: added meta data for the package and updated the build to take	2011-08-23 08:44:59 +00:00
github-backup	haskell-github-backup: update to version 1.20130414	2013-04-14 23:06:17 +02:00
hub	git-and-tools/hub: New package, version 1.10.3.	2012-12-12 12:36:18 +01:00
qgit	Don't try to build Qt guis if qt is unsupported on the platform	2010-09-15 18:52:07 +00:00
stgit	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
svn2git	* Revert r32435. We'll be doing a stdenv merge in a few days, so	2012-02-20 18:59:43 +00:00
svn2git-kde	* svn2git-kde 1.0.5.	2012-05-18 15:01:54 +00:00
tig	tig: enable bash completion	2013-04-01 18:37:52 +02:00
topgit	topgit: fix build on FreeBSD	2013-03-20 11:43:43 +01:00
default.nix	Revert "git: fix build on FreeBSD"	2013-04-22 15:26:26 +02:00