movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 14:10:33 +03:00
Code Activity

* Configuration options networking.defaultMailServer to enable direct mail

Browse source 
delivery without a local mail server (via ssmtp).
* Add vimDiet to the CD, not the system path in general.

svn path=/nixos/trunk/; revision=9607
This commit is contained in:
Eelco Dolstra 2007-11-08 18:15:12 +00:00
parent 89670079ab
commit 5bb4e343b4
4 changed files with 75 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
system/system.nix
View file

@ -221,7 +221,6 @@ rec {
pkgs.udev
pkgs.upstart
pkgs.utillinux
pkgs.vimDiet
pkgs.wirelesstools
nix
nixosInstall
@ -230,6 +229,7 @@ rec {
setuidWrapper
]
++ pkgs.lib.optional (config.get ["security" "sudo" "enable"]) pkgs.sudo
++ pkgs.lib.optional (config.get ["networking" "defaultMailServer" "directDelivery"]) pkgs.ssmtp
++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
++ (config.get ["environment" "extraPackages"]) pkgs
++ pkgs.lib.optional (config.get ["fonts" "enableFontDir"]) fontDir;