Skip to content

Commit b22b045

Browse files
hamishmackTeofilC
andauthored
Add GHC 9.4.7 (#2031)
* Add GHC 9.4.7 * Fix for nixpkgs 22.11 * ifdLevel 0 * Fix for aarch64-darwin * Fix for ghc 9.4.7 widnows cross compile * Fix checking materialization on non x86_64-linux * Add more materializations * ifdLevel 1 * ifdLevel 2 * Disable broken tests * ifdLevel 3 --------- Co-authored-by: Teo Camarasu <teo.camarasu@tracsis.com>
1 parent 5ed5f27 commit b22b045

File tree

139 files changed

+25192
-21
lines changed

Some content is hidden

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

139 files changed

+25192
-21
lines changed

ci.nix

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,19 @@
5252
ghc8107 = false;
5353
ghc902 = false;
5454
ghc928 = false;
55-
ghc945 = false;
55+
ghc947 = false;
5656
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2305") {
5757
ghc8107 = false;
5858
ghc902 = false;
5959
ghc928 = false;
60-
ghc945 = false;
60+
ghc947 = false;
6161
ghc962 = false;
6262
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
6363
ghc884 = false;
6464
ghc8107 = true;
6565
ghc902 = false;
6666
ghc928 = true;
67-
ghc945 = true;
67+
ghc947 = true;
6868
ghc962 = true;
6969
ghc9820230704 = true;
7070
}));
@@ -80,17 +80,17 @@
8080
)) {
8181
inherit (lib.systems.examples) ghcjs;
8282
} // lib.optionalAttrs (nixpkgsName == "unstable"
83-
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc926" "ghc927" "ghc928" "ghc945" "ghc962" "ghc9820230704"])
83+
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc926" "ghc927" "ghc928" "ghc947" "ghc962" "ghc9820230704"])
8484
|| (system == "x86_64-darwin" && __elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
8585
inherit (lib.systems.examples) mingwW64;
86-
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923" "ghc924" "ghc926" "ghc927" "ghc928" "ghc945" "ghc962" "ghc9820230704"]) {
86+
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923" "ghc924" "ghc926" "ghc927" "ghc928" "ghc947" "ghc962" "ghc9820230704"]) {
8787
# Musl cross only works on linux
8888
# aarch64 cross only works on linux
8989
inherit (lib.systems.examples) musl64 aarch64-multiplatform;
9090
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc927" "ghc928"]) {
9191
# TODO fix this for the compilers we build with hadrian (ghc >=9.4)
9292
inherit (lib.systems.examples) aarch64-multiplatform-musl;
93-
} // lib.optionalAttrs (system == "aarch64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc927" "ghc928" "ghc945" "ghc962" "ghc9820230704"]) {
93+
} // lib.optionalAttrs (system == "aarch64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc927" "ghc928" "ghc947" "ghc962" "ghc9820230704"]) {
9494
inherit (lib.systems.examples) aarch64-multiplatform-musl;
9595
};
9696
isDisabled = d: d.meta.disabled or false;

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-9.4.7-x86_64-linux/ghc-pkg/dump-global

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

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-9.4.7-x86_64-linux/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/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-9.4.7-x86_64-linux/ghc/info

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

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-9.4.7-x86_64-linux/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/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-9.4.7-x86_64-linux/ghc/supported-languages

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

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-9.4.7-x86_64-linux/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)