stevefan1999
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nixbld: update hydra

This commit is contained in:
Sebastien Bourdeauducq 2020-04-20 15:37:46 +08:00
parent 4b92e7c00f
commit f7f3ec9a37
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixbld-etc-nixos/configuration.nix
View File

@ -243,6 +243,7 @@ in
]; ];
services.hydra = { services.hydra = {
enable = true; enable = true;
package = pkgs.hydra-unstable;
useSubstitutes = true; useSubstitutes = true;
hydraURL = "https://nixbld.m-labs.hk"; hydraURL = "https://nixbld.m-labs.hk";
notificationSender = "hydra@m-labs.hk"; notificationSender = "hydra@m-labs.hk";
@ -358,7 +359,7 @@ in
nixpkgs.config.packageOverrides = super: let self = super.pkgs; in { nixpkgs.config.packageOverrides = super: let self = super.pkgs; in {
firmwareLinuxNonfree = super.callPackage ./firmware-linux-nonfree.nix {}; firmwareLinuxNonfree = super.callPackage ./firmware-linux-nonfree.nix {};
hydra-migration = super.hydra-migration.overrideAttrs(oa: { hydra-unstable = super.hydra-unstable.overrideAttrs(oa: {
patches = oa.patches or [] ++ [ ./hydra-conda.patch ./hydra-retry.patch ]; patches = oa.patches or [] ++ [ ./hydra-conda.patch ./hydra-retry.patch ];
hydraPath = oa.hydraPath + ":" + super.lib.makeBinPath [ super.jq ]; hydraPath = oa.hydraPath + ":" + super.lib.makeBinPath [ super.jq ];
}); });

2
nixbld-etc-nixos/hydra-retry.patch
View File

@ -13,7 +13,7 @@ index 69c430eb..bdbc808d 100644
case BuildResult::TransientFailure: case BuildResult::TransientFailure:
result.stepStatus = bsFailed; result.stepStatus = bsFailed;
- result.canRetry = true; - result.canRetry = true;
+ result.canRetry = get(step->drv.env, "__hydraRetry", "1") == "1"; + result.canRetry = get(step->drv->env, "__hydraRetry").value_or("1") == "1";
result.errorMsg = ""; result.errorMsg = "";
break; break;
case BuildResult::TimedOut: case BuildResult::TimedOut: