diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-09-09 17:35:24 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-09-09 17:36:25 +0200 |
| commit | cb614ef4ad701658f4cc5f6ec4b0d15d979c3a04 (patch) | |
| tree | 9d4e660213ec965d9f9eda0b1ec70fc89e88c8af /nixos | |
| parent | cf7b782ea96947e56acd68480c5dd13fc6cec9d1 (diff) | |
| download | nixlib-cb614ef4ad701658f4cc5f6ec4b0d15d979c3a04.tar nixlib-cb614ef4ad701658f4cc5f6ec4b0d15d979c3a04.tar.gz nixlib-cb614ef4ad701658f4cc5f6ec4b0d15d979c3a04.tar.bz2 nixlib-cb614ef4ad701658f4cc5f6ec4b0d15d979c3a04.tar.lz nixlib-cb614ef4ad701658f4cc5f6ec4b0d15d979c3a04.tar.xz nixlib-cb614ef4ad701658f4cc5f6ec4b0d15d979c3a04.tar.zst nixlib-cb614ef4ad701658f4cc5f6ec4b0d15d979c3a04.zip | |
nixos/jenkins: remove use of types.string (it's deprecated)
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/continuous-integration/jenkins/default.nix | 8 | ||||
| -rw-r--r-- | nixos/modules/services/continuous-integration/jenkins/slave.nix | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 1a4e7fe213c9..570b53038be3 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -15,7 +15,7 @@ in { user = mkOption { default = "jenkins"; - type = with types; string; + type = types.str; description = '' User the jenkins server should execute under. ''; @@ -23,7 +23,7 @@ in { group = mkOption { default = "jenkins"; - type = with types; string; + type = types.str; description = '' If the default user "jenkins" is configured then this is the primary group of that user. @@ -32,7 +32,7 @@ in { home = mkOption { default = "/var/lib/jenkins"; - type = with types; string; + type = types.path; description = '' The path to use as JENKINS_HOME. If the default user "jenkins" is configured then this is the home of the "jenkins" user. @@ -57,7 +57,7 @@ in { environment = mkOption { default = { NIX_REMOTE = "daemon"; }; - type = with types; attrsOf string; + type = with types; attrsOf str; description = '' Additional environment variables to be passed to the jenkins process. The environment will always include JENKINS_HOME. diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixos/modules/services/continuous-integration/jenkins/slave.nix index 5836d92a4fc0..a0216caf2b5c 100644 --- a/nixos/modules/services/continuous-integration/jenkins/slave.nix +++ b/nixos/modules/services/continuous-integration/jenkins/slave.nix @@ -23,7 +23,7 @@ in { user = mkOption { default = "jenkins"; - type = with types; string; + type = types.str; description = '' User the jenkins slave agent should execute under. ''; @@ -31,7 +31,7 @@ in { group = mkOption { default = "jenkins"; - type = with types; string; + type = types.str; description = '' If the default slave agent user "jenkins" is configured then this is the primary group of that user. @@ -40,7 +40,7 @@ in { home = mkOption { default = "/var/lib/jenkins"; - type = with types; string; + type = types.path; description = '' The path to use as JENKINS_HOME. If the default user "jenkins" is configured then this is the home of the "jenkins" user. |