Author: eelco
Date: Sat Feb 19 17:21:29 2011
New Revision: 26034
URL: https://svn.nixos.org/websvn/nix/?rev=26034&sc=1
Log:
* Enable IPv6 support by default. (Note that most NixOS systems
already had the ipv6 kernel module loaded, because dhclient needs
it.)
Modified:
nixos/trunk/modules/services/mail/postfix.nix
nixos/trunk/modules/tasks/network-interfaces.nix
Modified: nixos/trunk/modules/services/mail/postfix.nix
==============================================================================
--- nixos/trunk/modules/services/mail/postfix.nix Sat Feb 19 16:54:54
2011 (r26033)
+++ nixos/trunk/modules/services/mail/postfix.nix Sat Feb 19 17:21:29
2011 (r26034)
@@ -21,7 +21,7 @@
default_privs = nobody
''
- + optionalString (config.services.gw6c.enable ||
config.networking.nativeIPv6) (''
+ + optionalString (config.services.gw6c.enable ||
config.networking.enableIPv6) (''
inet_protocols = all
'')
+ (if cfg.networks != null then
Modified: nixos/trunk/modules/tasks/network-interfaces.nix
==============================================================================
--- nixos/trunk/modules/tasks/network-interfaces.nix Sat Feb 19 16:54:54
2011 (r26033)
+++ nixos/trunk/modules/tasks/network-interfaces.nix Sat Feb 19 17:21:29
2011 (r26034)
@@ -26,11 +26,10 @@
'';
};
- networking.nativeIPv6 = mkOption {
- default = false;
+ networking.enableIPv6 = mkOption {
+ default = true;
description = ''
- Whether to use IPv6 even though gw6c is not used. For example,
- for Postfix.
+ Whether to enable support for IPv6.
'';
};
@@ -145,6 +144,8 @@
config = {
+ boot.kernelModules = optional cfg.enableIPv6 "ipv6";
+
environment.systemPackages =
[ pkgs.host
pkgs.iproute
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
