Peter Simons 6b1ebeccf2 Merge branch 'master' into stdenv-updates. ... There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix, which I resolved to the best of my knowledge. I'd appreciate if some of the ruby gurus could have a look at the outcome of my merge, though.		2013-06-11 12:11:25 +02:00
..
admin
archivers	unzip: add bzip2 as native build input	2013-05-26 19:25:37 +02:00
audio/pa-applet	pa-audio: adding hash	2013-05-13 10:10:05 +02:00
backup	partclone, partimage. both are used by clonezilla and drbl (which I haven't packaged yet)	2013-05-16 17:18:11 +02:00
bluetooth	bluedevil: update to 1.3.1	2013-05-10 04:38:16 +03:00
cd-dvd
compression	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-05-22 12:30:02 +02:00
filesystems	Change package versions to conform to nixpkgs conventions.	2013-06-09 05:41:44 +03:00
graphics	Add myself as maintainer for several packages	2013-05-20 20:28:15 +02:00
inputmethods/fcitx
misc	Merge branch 'master' into stdenv-updates.	2013-06-11 12:11:25 +02:00
networking	Merge branch 'master' into stdenv-updates.	2013-06-11 12:11:25 +02:00
package-management	Merge branch 'master' into stdenv-updates.	2013-06-11 12:11:25 +02:00
security	nmap: help zenmap to find it's templates in nix-store	2013-06-06 12:09:19 +04:00
system	Fix vboot_reference's libuuid overriding to work on systems wo libuuid	2013-05-27 23:36:43 +02:00
text	Merge branch 'master' into stdenv-updates.	2013-06-11 12:11:25 +02:00
typesetting	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
video	Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions.	2013-06-07 03:15:45 +03:00
virtualization	Update euca2ools to 2.1.3	2013-05-30 15:02:36 +02:00
X11