Skip to content

Commit

Permalink
support GHC 9.4.4 (#1822)
Browse files Browse the repository at this point in the history
* GHC 9.4.4

* Add materialized dummy-ghc/ghc-9.4.4-x86_64-linux

* More ghc 9.4.4 changes

* Add materialized files

* Fix typo

Co-authored-by: Teo Camarasu <teofilcamarasu@gmail.com>
Co-authored-by: Hamish Mackenzie <Hamish.K.Mackenzie@gmail.com>
  • Loading branch information
3 people committed Jan 24, 2023
1 parent ee6e1d7 commit e83ef3d
Show file tree
Hide file tree
Showing 104 changed files with 19,729 additions and 16 deletions.
2 changes: 1 addition & 1 deletion build.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ in rec {
"ghc8107" = "3.4.1";
}.${compiler-nix-name} or "latest";
};
} // pkgs.lib.optionalAttrs (!__elem compiler-nix-name ["ghc941" "ghc942" "ghc943"]) {
} // pkgs.lib.optionalAttrs (!__elem compiler-nix-name ["ghc941" "ghc942" "ghc943" "ghc944"]) {
stack = tool compiler-nix-name "stack" { version = "2.9.3"; inherit evalPackages; };
hls-latest = tool compiler-nix-name "haskell-language-server" {
inherit evalPackages;
Expand Down
4 changes: 2 additions & 2 deletions ci.nix
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
ghc902 = false;
ghc924 = false;
ghc925 = true;
ghc943 = true;
ghc944 = true;
}));
crossSystems = nixpkgsName: nixpkgs: compiler-nix-name:
# We need to use the actual nixpkgs version we're working with here, since the values
Expand All @@ -67,7 +67,7 @@
|| (system == "x86_64-darwin" && __elem compiler-nix-name ["ghc8107"]))) {
inherit (lib.systems.examples) ghcjs;
} // lib.optionalAttrs (nixpkgsName == "unstable"
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc925" "ghc943"])
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc925" "ghc944"])
|| (system == "x86_64-darwin" && __elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
inherit (lib.systems.examples) mingwW64;
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923" "ghc924" "ghc925"]) {
Expand Down
2,156 changes: 2,156 additions & 0 deletions materialized/dummy-ghc/ghc-9.4.4-aarch64-linux/ghc-pkg/dump-global

Large diffs are not rendered by default.

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

80 changes: 80 additions & 0 deletions materialized/dummy-ghc/ghc-9.4.4-aarch64-linux/ghc/info

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.

268 changes: 268 additions & 0 deletions materialized/dummy-ghc/ghc-9.4.4-aarch64-linux/ghc/supported-languages

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

1 change: 1 addition & 0 deletions materialized/dummy-ghc/ghc-9.4.4-aarch64-linux/ghc/version

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

Loading

0 comments on commit e83ef3d

Please sign in to comment.