public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2019-09-02 23:25:24 +02:00
parent b291f2a995 12ae04518b
commit f21211ebfe
277 changed files with 4766 additions and 1895 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/virtualisation/containers.nix
+4 -4
View File
@@ -337,7 +337,7 @@ let
networkOptions = {
hostBridge = mkOption {
type = types.nullOr types.string;
type = types.nullOr types.str;
default = null;
example = "br0";
description = ''
@@ -387,7 +387,7 @@ let
};
hostAddress6 = mkOption {
type = types.nullOr types.string;
type = types.nullOr types.str;
default = null;
example = "fc00::1";
description = ''
@@ -409,7 +409,7 @@ let
};
localAddress6 = mkOption {
type = types.nullOr types.string;
type = types.nullOr types.str;
default = null;
example = "fc00::2";
description = ''
@@ -565,7 +565,7 @@ in
};
interfaces = mkOption {
type = types.listOf types.string;
type = types.listOf types.str;
default = [];
example = [ "eth1" "eth2" ];
description = ''