Vladimír Čunát 0a58b512cb Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/compilers/gcc/4.8/default.nix pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/gmp/5.1.3.nix pkgs/development/libraries/gmp/5.1.x.nix pkgs/top-level/all-packages.nix		2014-01-18 14:46:20 +01:00
..
admin	Buid Xvnc in TigerVNC	2014-01-04 15:02:52 +04:00
archivers	Merge master into stdenv-updates	2014-01-04 18:34:53 +01:00
audio	pa_applet: work around a build problem	2013-12-10 13:41:20 +01:00
backup	duplicity: update to version 0.6.22	2014-01-13 17:05:45 +01:00
bluetooth	update obexftp, required for new openobex	2013-08-28 21:20:56 +02:00
cd-dvd	xorriso: add missing attr dependency	2013-12-21 02:28:26 +02:00
compression	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
filesystems	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
graphics	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
inputmethods/fcitx	fcitx: update to 4.2.8.3	2013-09-28 19:44:52 +08:00
misc	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
networking	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
package-management	nixUnstable: Update to 1.7pre3319_f4013b6	2014-01-09 13:20:08 +01:00
security	sudo: update from 1.8.8 to 1.8.9p3	2014-01-15 11:02:22 +01:00
system	syslog-ng: add missing python build input	2014-01-15 17:29:14 +01:00
text	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
typesetting	xmlto: update from 0.0.23 to 0.0.25	2014-01-13 18:12:17 +01:00
video	swfmill: update from 0.3.2 to 0.3.3	2013-12-21 02:28:26 +02:00
virtualization	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
X11	xbindkeys: update from 1.8.5 to 1.8.6	2014-01-14 09:00:49 +04:00