Peter Simons 76244ac2e2 Merge branch 'master' into stdenv-updates ... Conflicts: pkgs/development/compilers/ghc/with-packages.nix		2013-08-16 22:51:13 +02:00
..
admin	Move namePrefix="" python packages out of python-packges.nix	2013-07-31 13:34:11 +02:00
archivers	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
audio	acoustid-fingerprinter: Add new package, v0.6.	2013-08-14 20:50:58 +02:00
backup	Update tarsnap to version 1.0.35	2013-07-25 06:49:25 -04:00
bluetooth
cd-dvd
compression	Merge remote-tracking branch 'master' into stdenv-updates.	2013-07-30 11:29:30 +02:00
filesystems	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
graphics	netpbm: Fix a truly random build failure	2013-07-23 11:17:26 +02:00
inputmethods/fcitx
misc	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
networking	Merge branch 'master' into stdenv-updates	2013-08-16 22:51:13 +02:00
package-management	nixUnstable: Update to 1.6pre3187_3fb7ae0	2013-08-12 14:22:16 +02:00
security	torbutton: package version 1.6.1	2013-08-10 20:09:18 +03:00
system	smartmontools: update to version 6.2	2013-07-27 11:05:59 +02:00
text	Merge remote-tracking branch 'master' into stdenv-updates.	2013-07-30 11:29:30 +02:00
typesetting
video	Move namePrefix="" python packages out of python-packges.nix	2013-07-31 13:34:11 +02:00
virtualization
X11	xrestop: package 0.4	2013-08-06 03:56:21 +03:00