Skip to content

Commit

Permalink
Try #1713:
Browse files Browse the repository at this point in the history
  • Loading branch information
iohk-bors[bot] committed Sep 27, 2022
2 parents 3a9ba9f + f9386f4 commit a9a0590
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 5 deletions.
4 changes: 3 additions & 1 deletion ci.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@
# Update supported-ghc-versions.md to reflect any changes made here.
nixpkgs.lib.optionalAttrs (nixpkgsName == "R2205") {
ghc865 = false;
ghc810420210212 = false; # TODO remove when plutus no longer uses this.
ghc8107 = false;
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
ghc865 = false;
ghc884 = false; # Native version is used to boot 9.0.1
ghc810420210212 = false; # TODO remove when plutus no longer uses this.
ghc8107 = true;
ghc902 = false;
ghc924 = true;
Expand All @@ -43,7 +45,7 @@
nixpkgs.lib.filter (v:
# We have less x86_64-darwin build capacity so build fewer GhC versions
(v != "x86_64-darwin" || (
!__elem compiler-nix-name ["ghc8104" "ghc810420210212" "ghc8105" "ghc8106" "ghc901" "ghc921" "ghc922"]))
!__elem compiler-nix-name ["ghc8104" "ghc8105" "ghc8106" "ghc901" "ghc921" "ghc922"]))
&&
# aarch64-darwin requires ghc 8.10.7
(v != "aarch64-darwin" || (
Expand Down
1 change: 1 addition & 0 deletions lib/call-cabal-project-to-nix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,7 @@ let
# the `with-compiler:` in the `cabal.project` file.
ghc.targetPrefix}ghc \
--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg \
--with-pkg-config=${ghc.targetPrefix}pkg-config \
--enable-tests \
--enable-benchmarks \
${pkgs.lib.optionalString (ghc.targetPrefix == "js-unknown-ghcjs-")
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix-tools/ci.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[dimensions]
os = [ "x86_64-darwin", "x86_64-linux" ]
compiler = [ "ghc865", "ghc882", "ghc883", "ghc884", "ghc8102", "ghc8103", "ghc8104", "ghc8105", "ghc8106", "ghc8107" ]
compiler = [ "ghc865", "ghc882", "ghc883", "ghc884", "ghc8102", "ghc8103", "ghc8104", "ghc810420210212", "ghc8105", "ghc8106", "ghc8107" ]
disable = [ ]

0 comments on commit a9a0590

Please sign in to comment.