Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/applications/audio/espeak/edit.nix pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix		2014-07-28 11:30:49 +02:00
..
apcupsd.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
dd-agent.nix	Fix dogstatsd, needs procps in path.	2014-05-18 13:00:57 +02:00
graphite.nix	nixos/graphite-service: clean up restartTriggers	2014-06-09 11:40:33 +02: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: change activationScript to preStart script	2014-07-26 00:31:34 +02:00
nagios.nix	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
smartd.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
statsd.nix	nixos/statsd-service: fix 'graphitePort' default value	2014-06-08 16:10:39 +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	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00