nix: modules/spindle: Fix nix option to match spindle #327

merged

opened by

freshlybakedca.ke 4 months ago targeting master from freshlybakedca.ke/core: private/coded/push-wzyxpsttrxsp

There was a change the environment variables in spindle that were not reflected in this nix module, specifically STEP_TIMEOUT was renamed to WORKFLOW_TIMEOUT, which means that there was no way to set the timeout in the nix module.

With the option name being updated, this is a breaking change that will require you to update your nix config if you are using the spindle module.

options

unified split

Changed files

+2 -2

nix

modules

spindle.nix

+2 -2

nix/modules/spindle.nix

···

       60
       60
        
                   description = "Nixery instance to use";

     

       61
       61
        
                 };

     

       62
       62
        
       

     

       63
       63
       -
                 stepTimeout = mkOption {

     

       63
       63
       +
                 workflowTimeout = mkOption {

     

       64
       64
        
                   type = types.str;

     

       65
       65
        
                   default = "5m";

     

       66
       66
        
                   description = "Timeout for each step of a pipeline";

     
···

       87
       87
        
                   "SPINDLE_SERVER_DEV=${lib.boolToString cfg.server.dev}"

     

       88
       88
        
                   "SPINDLE_SERVER_OWNER=${cfg.server.owner}"

     

       89
       89
        
                   "SPINDLE_PIPELINES_NIXERY=${cfg.pipelines.nixery}"

     

       90
       90
       -
                   "SPINDLE_PIPELINES_STEP_TIMEOUT=${cfg.pipelines.stepTimeout}"

     

       90
       90
       +
                   "SPINDLE_PIPELINES_WORKFLOW_TIMEOUT=${cfg.pipelines.workflowTimeout}"

     

       91
       91
        
                 ];

     

       92
       92
        
                 ExecStart = "${self.packages.${pkgs.system}.spindle}/bin/spindle";

     

       93
       93
        
                 Restart = "always";