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
..
atool	atool: add archiver helper	2012-08-15 01:10:05 +04:00
cabextract	cabextract: Update to 1.4	2012-10-05 16:06:19 -04:00
cpio	cpio: fix build without gets	2013-03-20 23:01:36 +01:00
cromfs	* Cromfs updated to 1.5.10 (to get it to build with GCC 4.6).	2012-02-19 16:58:40 +00:00
dar	Updating dar to 2.4.6	2012-06-24 19:12:20 +02:00
gnutar	gnutar root build: Nix on Illumos doesn't support build users yet.	2013-02-28 20:04:05 +01:00
p7zip	p7zip: Update to 9.20.1	2012-10-05 16:06:35 -04:00
sharutils	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
unarj	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
unrar	Updating unrar.	2010-03-22 15:58:25 +00:00
unshield	unshield, use latest svn version	2011-01-30 15:30:22 +00:00
unzip	svn merge ^/nixpkgs/trunk	2012-02-14 14:33:10 +00:00
zip	zip: Add extra source URL	2012-11-06 11:23:34 +01:00
zpaq	Auto-update some packages; no early build failures (SBCL and Wine not yet fully built)	2013-04-23 09:15:48 +04:00