commit a61e26a63d03c4fd30efe61764fdb2fa8358480f · pyrox.dev/nixpkgs

+11 -5
nixos/modules/services/continuous-integration/jenkins/default.nix
···

       65
       65
        
             };

     

       66
       66
        
       

     

       67
       67
        
             environment = mkOption {

     

       68
       68
       -
               default = { NIX_REMOTE = "daemon"; };

     

       68
       68
       +
               default = { };

     

       69
       69
        
               type = with types; attrsOf str;

     

       70
       70
        
               description = ''

     

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

     

       72
       72
       -
                 The environment will always include JENKINS_HOME.

     

       72
       72
       +
                 This setting will merge with everything in

     

       73
       73
       +
                 <option>config.environment.sessionVariables</option>,

     

       74
       74
       +
                 JENKINS_HOME and NIX_REMOTE. This option takes precedence and can

     

       75
       75
       +
                 override any previously set environment variable.

     

       73
       76
        
               '';

     

       74
       77
        
             };

     

       75
       78
        
       

     
···

       106
       109
        
             after = [ "network.target" ];

     

       107
       110
        
             wantedBy = [ "multi-user.target" ];

     

       108
       111
        
       

     

       109
       109
       -
             environment = {

     

       110
       110
       -
               JENKINS_HOME = cfg.home;

     

       111
       111
       -
             } // cfg.environment;

     

       112
       112
       +
             environment =

     

       113
       113
       +
               config.environment.sessionVariables //

     

       114
       114
       +
               { JENKINS_HOME = cfg.home;

     

       115
       115
       +
                 NIX_REMOTE = "daemon";

     

       116
       116
       +
               } //

     

       117
       117
       +
               cfg.environment;

     

       112
       118
        
       

     

       113
       119
        
             path = cfg.packages;

     

       114
       120