diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-08 18:01:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-08 18:01:04 +0000 |
| commit | 13d222c591f2c2a74bcf19f046f76fa3531bf98a (patch) | |
| tree | 8af9fbba3ddc8441bf08c75adea81b1930138b06 /nixos | |
| parent | ba83271df0ecfd8e9f149b632f370512ff946734 (diff) | |
| parent | a5d28c9bffb49868ca5688e5767d0782a995163b (diff) | |
| download | nixlib-13d222c591f2c2a74bcf19f046f76fa3531bf98a.tar nixlib-13d222c591f2c2a74bcf19f046f76fa3531bf98a.tar.gz nixlib-13d222c591f2c2a74bcf19f046f76fa3531bf98a.tar.bz2 nixlib-13d222c591f2c2a74bcf19f046f76fa3531bf98a.tar.lz nixlib-13d222c591f2c2a74bcf19f046f76fa3531bf98a.tar.xz nixlib-13d222c591f2c2a74bcf19f046f76fa3531bf98a.tar.zst nixlib-13d222c591f2c2a74bcf19f046f76fa3531bf98a.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -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"; |