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
..
munin	fixing munin (broken by latest version update) also switch to fetchgit	2014-01-16 18:07:16 +00:00
nagios
net-snmp	net_snmp: fix build by autoreconfing	2014-01-05 11:19:07 +01:00
zabbix	Add meta.branch to some packages	2014-01-08 18:06:18 +02:00