Skip to content

Commit 90795fe

Browse files
Try #1566:
2 parents 6d0177f + 50a0234 commit 90795fe

File tree

133 files changed

+22599
-25
lines changed

Some content is hidden

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

133 files changed

+22599
-25
lines changed

build.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ in rec {
3434
"ghc884" = "3.3.6";
3535
}.compiler-nix-name or "latest";
3636
};
37-
} // pkgs.lib.optionalAttrs (!__elem compiler-nix-name ["ghc921" "ghc922" "ghc923"]) {
37+
} // pkgs.lib.optionalAttrs (!__elem compiler-nix-name ["ghc921" "ghc922" "ghc923" "ghc924"]) {
3838
hls-latest = tool compiler-nix-name "haskell-language-server" { inherit evalPackages; };
3939
})
4040
);

ci.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
ghc884 = false; # Native version is used to boot 9.0.1
4242
ghc8107 = true;
4343
ghc902 = true;
44-
ghc923 = true;
44+
ghc924 = true;
4545
});
4646
systems = nixpkgsName: nixpkgs: compiler-nix-name: nixpkgs.lib.genAttrs (
4747
nixpkgs.lib.filter (v:
@@ -62,14 +62,14 @@
6262
# of 'lib.systems.examples' are not understood between all versions
6363
let lib = nixpkgs.lib;
6464
in lib.optionalAttrs (nixpkgsName == "unstable"
65-
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc865" "ghc884" "ghc8107"])
65+
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc865" "ghc884" "ghc8107"])
6666
|| (system == "x86_64-darwin" && __elem compiler-nix-name ["ghc8107"]))) {
6767
inherit (lib.systems.examples) ghcjs;
6868
} // lib.optionalAttrs (nixpkgsName == "unstable"
69-
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc923"])
69+
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc924"])
7070
|| (system == "x86_64-darwin" && __elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
7171
inherit (lib.systems.examples) mingwW64;
72-
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923"]) {
72+
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923" "ghc924"]) {
7373
# Musl cross only works on linux
7474
# aarch64 cross only works on linux
7575
inherit (lib.systems.examples) musl64 aarch64-multiplatform;

docs/reference/supported-ghc-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ really should use an instance of Nixpkgs provided by `haskell.nix` itself.
2727
| unstable | `nixpkgs-unstable` | 8.8.4 | `ghc884` | No |
2828
| unstable | `nixpkgs-unstable` | 8.10.7 | `ghc8107` | Yes |
2929
| unstable | `nixpkgs-unstable` | 9.0.2 | `ghc902` | Yes |
30-
| unstable | `nixpkgs-unstable` | 9.2.3 | `ghc923` | Yes |
30+
| unstable | `nixpkgs-unstable` | 9.2.4 | `ghc924` | Yes |
3131

3232
See [ci.nix](https://github.com/input-output-hk/haskell.nix/blob/master/ci.nix)
3333
for the source of truth about what is built and tested (in the off chance this

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
};
6161

6262
outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-2105, nixpkgs-2111, nixpkgs-2205, flake-utils, ... }@inputs:
63-
let compiler = "ghc923";
63+
let compiler = "ghc924";
6464
config = import ./config.nix;
6565
in {
6666
inherit config;

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

Lines changed: 1512 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.2.4-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.2.4-x86_64-linux/ghc/info

Lines changed: 66 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.2.4-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.2.4-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.2.4-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)