diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2024-02-08 07:20:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-08 07:20:13 -0800 |
| commit | 2d8bd81554d7970cfcad8efb85a02bb0671d96f6 (patch) | |
| tree | acd6879e4e531cbd378ca15562398a61cfacb02d /nixos/modules | |
| parent | c442ab0b96787834fc05ab787f3622d53cd91fb7 (diff) | |
| parent | e6854b295bfa9c6d8fc43fede650d87154a3fcc8 (diff) | |
| download | nixlib-2d8bd81554d7970cfcad8efb85a02bb0671d96f6.tar nixlib-2d8bd81554d7970cfcad8efb85a02bb0671d96f6.tar.gz nixlib-2d8bd81554d7970cfcad8efb85a02bb0671d96f6.tar.bz2 nixlib-2d8bd81554d7970cfcad8efb85a02bb0671d96f6.tar.lz nixlib-2d8bd81554d7970cfcad8efb85a02bb0671d96f6.tar.xz nixlib-2d8bd81554d7970cfcad8efb85a02bb0671d96f6.tar.zst nixlib-2d8bd81554d7970cfcad8efb85a02bb0671d96f6.zip | |
Merge pull request #286063 from yaxitech/github-runner-node-runtimes-286059
nixos/github-runners: only override pkg if it has a `nodeRuntimes` arg
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/continuous-integration/github-runner/service.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/continuous-integration/github-runner/service.nix b/nixos/modules/services/continuous-integration/github-runner/service.nix index 535df7f68e07..784aea0edea7 100644 --- a/nixos/modules/services/continuous-integration/github-runner/service.nix +++ b/nixos/modules/services/continuous-integration/github-runner/service.nix @@ -22,7 +22,8 @@ with lib; let workDir = if cfg.workDir == null then runtimeDir else cfg.workDir; - package = cfg.package.override { inherit (cfg) nodeRuntimes; }; + # Support old github-runner versions which don't have the `nodeRuntimes` arg yet. + package = cfg.package.override (old: optionalAttrs (hasAttr "nodeRuntimes" old) { inherit (cfg) nodeRuntimes; }); in { description = "GitHub Actions runner"; |