Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates. ... Conflicts: pkgs/tools/misc/less/default.nix		2013-12-16 21:13:24 +01:00
..
admin
archivers	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
audio
backup	httrack: update from 3.47.21 to 3.47.27	2013-12-16 01:36:16 +02:00
bluetooth
cd-dvd
compression
filesystems	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
graphics	icoutils: update from 0.29.1 to 0.31.0	2013-12-16 01:36:17 +02:00
inputmethods/fcitx
misc	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
networking	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
package-management	cabal-install: jailbreak version 1.18.0.2 to fix the build with GHC 7.7 or later	2013-12-03 22:23:21 +01:00
security	ccrypt: update from 1.9 to 1.10	2013-12-15 10:54:18 +02:00
system	ioping: update from 0.4 to 0.7	2013-12-16 01:36:18 +02:00
text	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
typesetting	pgf1: update from 1.10 to 1.18	2013-12-14 00:30:29 +02:00
video
virtualization
X11	Fix a lots of evaluation errors on Hydra.	2013-12-10 23:20:23 +01:00