d5d3752 · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Merge #473

d5d3752iohk-bors[bot]7 years ago

bors.tomlnew file+8

@@ -0,0 +1,8 @@

1+status = [

2+ "buildkite/haskell-dot-nix",

3+ "ci/hydra:Cardano:haskell-nix:required",

4+]

5+timeout_sec = 7200

6+required_approvals = 1

7+block_labels = [ "WIP", "DO NOT MERGE" ]

8+delete_merged_branches = true

release.nix+7−4

@@ -72,11 +72,14 @@ in allJobs // {

72 constituents =

73 collect isDerivation allJobs.R1903.native

74 ++ collect isDerivation allJobs.R1909.native

75− # Windows cross compiling with GHC 8.8.2 is broken

76− # ++ collect isDerivation allJobs.R1903.x86_64-pc-mingw32

75+ ++ collect isDerivation allJobs.R1903.x86_64-pc-mingw32

77− # ++ collect isDerivation allJobs.R1909.x86_64-w64-mingw32

76+ ++ collect isDerivation allJobs.R1909.x86_64-w64-mingw32

78 ++ collect isDerivation allJobs.R1903.x86_64-unknown-linux-musl

77 ++ collect isDerivation allJobs.R1903.x86_64-unknown-linux-musl

79− ++ collect isDerivation allJobs.R1909.x86_64-unknown-linux-musl;

78+ ++ collect isDerivation (allJobs.R1909.x86_64-unknown-linux-musl

79+ // {

80+ # Exclude failing test (openssl issue in nixpkgs R1909 with musl)

81+ tests = filterAttrs (n: _: n != "fully-static") allJobs.R1909.x86_64-unknown-linux-musl.tests;

82+ });

80 };

83 };

81 }

84 }