Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size ...

Let's get rid of those merge conflicts.

2016-02-03 16:57:19 +01:00

..

apcupsd.nix

types.uniq types.bool -> types.bool

2015-06-15 18:10:26 +02:00

bosun.nix

bosun: Create ledisDir in pre-start script

2016-01-18 15:57:59 +01:00

cadvisor.nix

Merge branch 'staging' into closure-size

2016-01-19 09:55:31 +01:00

collectd.nix

collectd: add pidFile option, change default pid to /var/run/collectd.pid

2014-09-17 19:21:05 +02:00

das_watchdog.nix

fix argument in mkEnableOption

2015-06-21 18:21:21 +03:00

dd-agent.nix

Fix some references to deprecated /etc/ssl/certs/ca-bundle.crt

2016-01-29 02:32:05 +01:00

grafana.nix

Add missing 'type', 'defaultText' and 'literalExample' in module definitions

2016-01-17 19:41:23 +01:00

graphite.nix

treewide: Mass replace 'cairo}/lib' to refer the 'out' output

2016-01-24 10:03:33 +02:00

heapster.nix

Add missing 'type', 'defaultText' and 'literalExample' in module definitions

2016-01-17 19:41:23 +01:00

longview.nix

longview nixos module: improve description for mysql password config options

2015-11-22 12:37:00 +00:00

monit.nix

jobs -> systemd.services

2016-01-07 06:39:06 +00:00

munin.nix

Add missing 'type', 'defaultText' and 'literalExample' in module definitions

2016-01-17 19:41:23 +01:00

nagios.nix

Add missing 'type', 'defaultText' and 'literalExample' in module definitions

2016-01-17 19:41:23 +01:00

riemann-dash.nix

bundixify riemann-dash

2014-11-18 03:31:56 +00:00

riemann-tools.nix

Add riemann-tools to nixpkgs

2015-06-30 17:16:51 -04:00

riemann.nix

java: Normalize to the default jre / jdk

2015-01-07 14:55:41 -08:00

scollector.nix

Add missing 'type', 'defaultText' and 'literalExample' in module definitions

2016-01-17 19:41:23 +01:00

smartd.nix

nixos: fix some types

2015-09-18 18:48:50 +00:00

statsd.nix

nixos/statsd: rename 'host' to 'listenAddress'

2015-12-24 00:20:56 +01:00

systemhealth.nix

Another attempt to eradicate ensureDir

2014-06-30 14:56:10 +02:00

teamviewer.nix

teamviewer: init at 11.0.52520, remove older versions

2015-12-03 22:28:36 +03:00

ups.nix

jobs -> systemd.services

2016-01-07 06:39:06 +00: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