Charles Strahan dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby ... Conflicts: pkgs/applications/version-management/git-and-tools/default.nix pkgs/applications/version-management/git-and-tools/hub/default.nix pkgs/tools/audio/mpdcron/default.nix		2015-01-20 20:21:03 -05:00
..
bosun	bosun: Update to 20141215200935	2015-01-05 10:35:20 +00:00
cadvisor	Add cadvisor	2014-12-28 20:20:38 +01:00
munin	munin: remove /usr/{bin,sbin}/ references from plugins	2015-01-18 14:39:57 +01:00
nagios	nagios-plugins: 2.0 -> 2.0.3	2014-08-20 01:59:02 -05:00
net-snmp	net-snmp: Don't propagate openssl as this may break builds	2015-01-09 10:40:29 -08:00
newrelic-sysmond	Missed gcc refs	2014-12-26 12:28:15 -05:00
riemann	Upgrading Riemann 0.26 -> 0.27	2015-01-10 15:17:46 +00: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