Charles Strahan 145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby ... Conflicts: pkgs/applications/version-management/redmine/default.nix pkgs/development/interpreters/ruby/gem.nix pkgs/development/interpreters/ruby/generated.nix pkgs/development/interpreters/ruby/patches.nix pkgs/development/tools/vagrant/default.nix pkgs/servers/consul/default.nix		2014-12-28 14:29:52 -05:00
..
bosun	bosun: Now builds on all Unix platforms	2014-12-05 11:43:58 +00:00
munin	munin: 2.0.21 -> 2.0.25	2014-11-30 20:42:06 +01:00
nagios	nagios-plugins: 2.0 -> 2.0.3	2014-08-20 01:59:02 -05:00
net-snmp	net_snmp: openssl must be propagated as it required when linking against libnetsnmp	2014-10-08 01:37:46 -07:00
newrelic-sysmond	Missed gcc refs	2014-12-26 12:28:15 -05:00
riemann	Fixed many descriptions	2014-11-11 14:36:34 +01:00
riemann-dash	bundixify riemann-dash	2014-11-18 03:31:56 +00:00
seyren	*: fix builds by disregarding warning from new glibc	2014-11-28 18:42:03 +01:00
zabbix	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00