Peter Simons b33ad366a1 Merge branch 'master' into stdenv-updates.		2013-01-11 15:46:10 +01:00
..
admin	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
archivers	Merge remote-tracking branch 'origin/master' into stdenv-updates	2012-12-04 17:12:35 +01:00
backup	Merge branch 'master' into stdenv-updates.	2013-01-11 15:46:10 +01:00
bluetooth	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
cd-dvd	* Add bchunk.	2012-06-17 03:36:22 +00:00
compression	xz: Update to 5.0.4	2012-09-18 14:52:41 -04:00
filesystems	Merge branch 'master' into stdenv-updates.	2013-01-04 21:00:53 +01:00
graphics	Merge remote-tracking branch 'eelco/master' into stdenv-updates	2012-12-28 23:28:16 +01:00
misc	Merge branch 'master' into stdenv-updates.	2013-01-04 21:00:53 +01:00
networking	Merge branch 'master' into stdenv-updates.	2013-01-11 15:46:10 +01:00
package-management	Merge branch 'master' into stdenv-updates.	2013-01-11 15:46:10 +01:00
security	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
system	Update Monit	2012-12-04 10:21:36 +04:00
text	gawk: update to 4.0.2	2013-01-04 20:39:54 +01:00
typesetting	Update dblatex to 0.3.4	2012-12-01 21:09:21 +01:00
video	Updating rtmpdump to the 2.4 (what I think it is 2.4) in their git repository.	2011-09-25 09:04:24 +00:00
virtualization	ec2-api-tools: Update to 1.6.5.1	2012-11-08 16:31:08 +01:00
X11	Merge remote-tracking branch 'eelco/master' into stdenv-updates	2012-12-28 23:28:16 +01:00