nixbld: update hydra
This commit is contained in:
parent
4b92e7c00f
commit
f7f3ec9a37
|
@ -243,6 +243,7 @@ in
|
|||
];
|
||||
services.hydra = {
|
||||
enable = true;
|
||||
package = pkgs.hydra-unstable;
|
||||
useSubstitutes = true;
|
||||
hydraURL = "https://nixbld.m-labs.hk";
|
||||
notificationSender = "hydra@m-labs.hk";
|
||||
|
@ -358,7 +359,7 @@ in
|
|||
|
||||
nixpkgs.config.packageOverrides = super: let self = super.pkgs; in {
|
||||
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 ];
|
||||
hydraPath = oa.hydraPath + ":" + super.lib.makeBinPath [ super.jq ];
|
||||
});
|
||||
|
|
|
@ -13,7 +13,7 @@ index 69c430eb..bdbc808d 100644
|
|||
case BuildResult::TransientFailure:
|
||||
result.stepStatus = bsFailed;
|
||||
- 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 = "";
|
||||
break;
|
||||
case BuildResult::TimedOut:
|
||||
|
|
Loading…
Reference in New Issue