Skip to content

Commit 6101c6e

Browse files
hamishmackocharles
andauthored
Add GHC 9.0.2 (#1338)
Co-authored-by: Ollie Charles <ollie@ocharles.org.uk>
1 parent c8f7755 commit 6101c6e

File tree

78 files changed

+12035
-23
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+12035
-23
lines changed

build.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ in rec {
2424
tools = pkgs.lib.optionalAttrs (ifdLevel >= 3) (
2525
pkgs.recurseIntoAttrs ({
2626
cabal-latest = tool compiler-nix-name "cabal" "latest";
27-
} // pkgs.lib.optionalAttrs (!__elem compiler-nix-name ["ghc901" "ghc921"]) {
27+
} // pkgs.lib.optionalAttrs (!__elem compiler-nix-name ["ghc901" "ghc902" "ghc921"]) {
2828
hls-latest = tool compiler-nix-name "haskell-language-server" "latest";
2929
hlint-latest = tool compiler-nix-name "hlint" (if compiler-nix-name == "ghc865" then "3.2.7" else "latest");
3030
})

ci.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
ghc8106 = false;
3939
ghc8107 = true;
4040
ghc901 = false;
41+
ghc902 = true;
4142
ghc921 = true;
4243
ghc810420210212 = false;
4344
});

compiler/ghc/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ stdenv.mkDerivation (rec {
349349
dontStrip = true;
350350
dontPatchELF = true;
351351
noAuditTmpdir = true;
352-
} // lib.optionalAttrs (__elem ghc-version ["8.10.5" "8.10.6" "8.10.7" "9.2.1"] && stdenv.buildPlatform.isDarwin) {
352+
} // lib.optionalAttrs stdenv.buildPlatform.isDarwin {
353353
# ghc install on macOS wants to run `xattr -r -c`
354354
# The macOS version fails because it wants python 2.
355355
# The nix version of xattr does not support those args.

materialized/dummy-ghc/ghc-8.10.7-aarch64-darwin/ghc/info

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/ghc-9.0.2-aarch64-darwin/ghc-pkg/dump-global

Lines changed: 1766 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/ghc-9.0.2-aarch64-darwin/ghc-pkg/version

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/ghc-9.0.2-aarch64-darwin/ghc/info

Lines changed: 68 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/ghc-9.0.2-aarch64-darwin/ghc/numeric-version

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/ghc-9.0.2-aarch64-darwin/ghc/supported-languages

Lines changed: 261 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/ghc-9.0.2-aarch64-darwin/ghc/version

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)