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
..
apcupsd.nix	nixos/apcupsd: add systemd documentation hint	2014-09-06 00:14:42 +02:00
bosun.nix	fixes #5198	2014-12-02 12:59:14 +01:00
collectd.nix	collectd: add pidFile option, change default pid to /var/run/collectd.pid	2014-09-17 19:21:05 +02:00
dd-agent.nix	Fix dogstatsd, needs procps in path.	2014-05-18 13:00:57 +02:00
graphite.nix	nixos/graphite: fix user creation	2014-11-04 19:38:24 +01:00
monit.nix	Get all lib functions from lib, not pkgs.lib, in modules	2014-07-02 12:28:18 -04:00
munin.nix	nixos/munin: add /var/setuid-wrappers to PATH	2014-12-25 15:43:51 +01:00
nagios.nix	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
riemann-dash.nix	bundixify riemann-dash	2014-11-18 03:31:56 +00:00
riemann.nix	nixos/riemann: Add option configFiles	2014-11-19 12:56:42 +01:00
scollector.nix	scollector: Allow users to specify external collectors	2014-11-24 14:40:48 +00:00
smartd.nix	nixos/manual: Use literalExample when feasible.	2014-08-27 23:41:15 +02:00
statsd.nix	nixos/statsd: add support for external backends, fix a few options	2014-09-11 18:11:16 +02:00
systemhealth.nix	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
ups.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
uptime.nix	Get all lib functions from lib, not pkgs.lib, in modules	2014-07-02 12:28:18 -04:00
zabbix-agent.nix	Handle Zabbix agent and server both being enabled	2014-04-30 16:18:03 +02:00
zabbix-server.nix	zabbix-server: add extraConfig option	2014-11-03 16:47:07 +01:00