git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #68210 from ivan/nixos-railcar-string

nixos/railcar: remove use of the deprecated string type

commitcd9f199c2b408e0f1078dfca84df6f4ab77ff627 authorSilvan Mosberger <contact@infinisil.com> dateFri 6 Sep 2019, 17:42 (7 years ago) parent75388ff5a03f90
1 file changed+7−7
nixos/modules/virtualisation/railcar.nix+7−7
nixos/modules/virtualisation/railcar.nix+7−7
@@ -25,7 +25,7 @@ let
2525 mount = with types; (submodule {
2626 options = {
2727 type = mkOption {
28− type = string;
28+ type = str;
2929 default = "none";
3030 description = ''
3131 The type of the filesystem to be mounted.
@@ -37,11 +37,11 @@ let
3737 '';
3838 };
3939 source = mkOption {
40− type = string;
40+ type = str;
4141 description = "Source for the in-container mount";
4242 };
4343 options = mkOption {
44− type = loaOf (string);
44+ type = loaOf (str);
4545 default = [ "bind" ];
4646 description = ''
4747 Mount options of the filesystem to be used.
@@ -64,7 +64,7 @@ in
6464 type = with types; loaOf (submodule ({ name, config, ... }: {
6565 options = {
6666 cmd = mkOption {
67− type = types.string;
67+ type = types.lines;
6868 description = "Command or script to run inside the container";
6969 };
7070
@@ -83,19 +83,19 @@ in
8383 };
8484
8585 runType = mkOption {
86− type = types.string;
86+ type = types.str;
8787 default = "oneshot";
8888 description = "The systemd service run type";
8989 };
9090
9191 os = mkOption {
92− type = types.string;
92+ type = types.str;
9393 default = "linux";
9494 description = "OS type of the container";
9595 };
9696
9797 arch = mkOption {
98− type = types.string;
98+ type = types.str;
9999 default = "x86_64";
100100 description = "Computer architecture type of the container";
101101 };