commit 19a7b08ea77528bec37a418fa47cb5ad1a219fa9 · pyrox.dev/nixpkgs

+10 -2

nixos/modules/services/continuous-integration/github-runner/options.nix

···

       256
       256
        
                   };

     

       257
       257
        
       

     

       258
       258
        
                   nodeRuntimes = lib.mkOption {

     

       259
       259
       -
                     type = with lib.types; nonEmptyListOf (enum [ "node20" ]);

     

       260
       260
       -
                     default = [ "node20" ];

     

       259
       259
       +
                     type =

     

       260
       260
       +
                       with lib.types;

     

       261
       261
       +
                       nonEmptyListOf (enum [

     

       262
       262
       +
                         "node20"

     

       263
       263
       +
                         "node24"

     

       264
       264
       +
                       ]);

     

       265
       265
       +
                     default = [

     

       266
       266
       +
                       "node20"

     

       267
       267
       +
                       "node24"

     

       268
       268
       +
                     ];

     

       261
       269
        
                     description = ''

     

       262
       270
        
                       List of Node.js runtimes the runner should support.

     

       263
       271
        
                     '';

+18 -2

pkgs/by-name/gi/github-runner/package.nix

···

       16
       16
        
         buildPackages,

     

       17
       17
        
         runtimeShell,

     

       18
       18
        
         # List of Node.js runtimes the package should support

     

       19
       19
       -
         nodeRuntimes ? [ "node20" ],

     

       19
       19
       +
         nodeRuntimes ? [

     

       20
       20
       +
           "node20"

     

       21
       21
       +
           "node24"

     

       22
       22
       +
         ],

     

       20
       23
        
         nodejs_20,

     

       24
       24
       +
         nodejs_24,

     

       21
       25
        
       }:

     

       22
       26
        
       

     

       23
       27
        
       # Node.js runtimes supported by upstream

     

       24
       24
       -
       assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes;

     

       28
       28
       +
       assert builtins.all (

     

       29
       29
       +
         x:

     

       30
       30
       +
         builtins.elem x [

     

       31
       31
       +
           "node20"

     

       32
       32
       +
           "node24"

     

       33
       33
       +
         ]

     

       34
       34
       +
       ) nodeRuntimes;

     

       25
       35
        
       

     

       26
       36
        
       buildDotnetModule (finalAttrs: {

     

       27
       37
        
         pname = "github-runner";

     
···

       226
       236
        
         ''

     

       227
       237
        
         + lib.optionalString (lib.elem "node20" nodeRuntimes) ''

     

       228
       238
        
           ln -s ${nodejs_20} _layout/externals/node20

     

       239
       239
       +
         ''

     

       240
       240
       +
         + lib.optionalString (lib.elem "node24" nodeRuntimes) ''

     

       241
       241
       +
           ln -s ${nodejs_24} _layout/externals/node24

     

       229
       242
        
         '';

     

       230
       243
        
       

     

       231
       244
        
         postInstall = ''

     
···

       267
       280
        
         ''

     

       268
       281
        
         + lib.optionalString (lib.elem "node20" nodeRuntimes) ''

     

       269
       282
        
           ln -s ${nodejs_20} $out/lib/externals/node20

     

       283
       283
       +
         ''

     

       284
       284
       +
         + lib.optionalString (lib.elem "node24" nodeRuntimes) ''

     

       285
       285
       +
           ln -s ${nodejs_24} $out/lib/externals/node24

     

       270
       286
        
         ''

     

       271
       287
        
         + ''

     

       272
       288
        
           # Install Nodejs scripts called from workflows