commit cb614ef4ad701658f4cc5f6ec4b0d15d979c3a04 · pyrox.dev/nixpkgs

+4 -4

nixos/modules/services/continuous-integration/jenkins/default.nix

···

       15
       15
        
       

     

       16
       16
        
             user = mkOption {

     

       17
       17
        
               default = "jenkins";

     

       18
       18
       -
               type = with types; string;

     

       18
       18
       +
               type = types.str;

     

       19
       19
        
               description = ''

     

       20
       20
        
                 User the jenkins server should execute under.

     

       21
       21
        
               '';

     
···

       23
       23
        
       

     

       24
       24
        
             group = mkOption {

     

       25
       25
        
               default = "jenkins";

     

       26
       26
       -
               type = with types; string;

     

       26
       26
       +
               type = types.str;

     

       27
       27
        
               description = ''

     

       28
       28
        
                 If the default user "jenkins" is configured then this is the primary

     

       29
       29
        
                 group of that user.

     
···

       32
       32
        
       

     

       33
       33
        
             home = mkOption {

     

       34
       34
        
               default = "/var/lib/jenkins";

     

       35
       35
       -
               type = with types; string;

     

       35
       35
       +
               type = types.path;

     

       36
       36
        
               description = ''

     

       37
       37
        
                 The path to use as JENKINS_HOME. If the default user "jenkins" is configured then

     

       38
       38
        
                 this is the home of the "jenkins" user.

     
···

       57
       57
        
       

     

       58
       58
        
             environment = mkOption {

     

       59
       59
        
               default = { NIX_REMOTE = "daemon"; };

     

       60
       60
       -
               type = with types; attrsOf string;

     

       60
       60
       +
               type = with types; attrsOf str;

     

       61
       61
        
               description = ''

     

       62
       62
        
                 Additional environment variables to be passed to the jenkins process.

     

       63
       63
        
                 The environment will always include JENKINS_HOME.

+3 -3

nixos/modules/services/continuous-integration/jenkins/slave.nix

···

       23
       23
        
       

     

       24
       24
        
             user = mkOption {

     

       25
       25
        
               default = "jenkins";

     

       26
       26
       -
               type = with types; string;

     

       26
       26
       +
               type = types.str;

     

       27
       27
        
               description = ''

     

       28
       28
        
                 User the jenkins slave agent should execute under.

     

       29
       29
        
               '';

     
···

       31
       31
        
       

     

       32
       32
        
             group = mkOption {

     

       33
       33
        
               default = "jenkins";

     

       34
       34
       -
               type = with types; string;

     

       34
       34
       +
               type = types.str;

     

       35
       35
        
               description = ''

     

       36
       36
        
                 If the default slave agent user "jenkins" is configured then this is

     

       37
       37
        
                 the primary group of that user.

     
···

       40
       40
        
       

     

       41
       41
        
             home = mkOption {

     

       42
       42
        
               default = "/var/lib/jenkins";

     

       43
       43
       -
               type = with types; string;

     

       43
       43
       +
               type = types.path;

     

       44
       44
        
               description = ''

     

       45
       45
        
                 The path to use as JENKINS_HOME. If the default user "jenkins" is configured then

     

       46
       46
        
                 this is the home of the "jenkins" user.