Skip to content

Commit 6a06f96

Browse files
hamishmackhamishmack
authored
Add GHC 9.6.2 and 9.2.8 (#1969)
* Add GHC 9.6.2 and 9.2.8 * ifdLevel 1 * Include order patch is needed for ghc 9.6.2 * ifdLevel 0 * ifdLevel 1 * Materialized files * More materialization * More materialization * More materialization * ifdLevel 2 * Update tests * Update tests * ifdLevel 3 * Update tests * Update tests * Update tests * Update tests * Update tests
1 parent 5a7b70e commit 6a06f96

File tree

315 files changed

+44484
-56
lines changed

Some content is hidden

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

315 files changed

+44484
-56
lines changed

‎ci.nix

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,39 +50,39 @@
5050
nixpkgs.lib.optionalAttrs (nixpkgsName == "R2211") {
5151
ghc8107 = false;
5252
ghc902 = false;
53-
ghc927 = false;
53+
ghc928 = false;
5454
ghc945 = false;
5555
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
5656
ghc884 = false;
5757
ghc8107 = true;
5858
ghc902 = false;
59-
ghc927 = true;
59+
ghc928 = true;
6060
ghc945 = true;
61-
ghc961 = true;
61+
ghc962 = true;
6262
}));
6363
crossSystems = nixpkgsName: nixpkgs: compiler-nix-name:
6464
# We need to use the actual nixpkgs version we're working with here, since the values
6565
# of 'lib.systems.examples' are not understood between all versions
6666
let lib = nixpkgs.lib;
6767
in lib.optionalAttrs (nixpkgsName == "unstable"
68-
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc961"])
69-
|| (system == "aarch64-linux" && __elem compiler-nix-name ["ghc8107" "ghc961"])
70-
|| (system == "x86_64-darwin" && __elem compiler-nix-name ["ghc8107" "ghc961"])
71-
|| (system == "aarch64-darwin" && __elem compiler-nix-name ["ghc8107" "ghc961"])
68+
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc962"])
69+
|| (system == "aarch64-linux" && __elem compiler-nix-name ["ghc8107" "ghc962"])
70+
|| (system == "x86_64-darwin" && __elem compiler-nix-name ["ghc8107" "ghc962"])
71+
|| (system == "aarch64-darwin" && __elem compiler-nix-name ["ghc8107" "ghc962"])
7272
)) {
7373
inherit (lib.systems.examples) ghcjs;
7474
} // lib.optionalAttrs (nixpkgsName == "unstable"
75-
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc926" "ghc927" "ghc945" "ghc961"])
75+
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc926" "ghc927" "ghc928" "ghc945" "ghc962"])
7676
|| (system == "x86_64-darwin" && __elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
7777
inherit (lib.systems.examples) mingwW64;
78-
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923" "ghc924" "ghc926" "ghc927" "ghc945" "ghc961"]) {
78+
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923" "ghc924" "ghc926" "ghc927" "ghc928" "ghc945" "ghc962"]) {
7979
# Musl cross only works on linux
8080
# aarch64 cross only works on linux
8181
inherit (lib.systems.examples) musl64 aarch64-multiplatform;
82-
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc927"]) {
82+
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc927" "ghc928"]) {
8383
# TODO fix this for the compilers we build with hadrian (ghc >=9.4)
8484
inherit (lib.systems.examples) aarch64-multiplatform-musl;
85-
} // lib.optionalAttrs (system == "aarch64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc927" "ghc944" "ghc961"]) {
85+
} // lib.optionalAttrs (system == "aarch64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc927" "ghc928" "ghc945" "ghc962"]) {
8686
inherit (lib.systems.examples) aarch64-multiplatform-musl;
8787
};
8888
isDisabled = d: d.meta.disabled or false;

‎docs/tutorials/development/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ in pkgs.haskell-nix.project {
2626
src = ./.;
2727
};
2828
# Specify the GHC version to use.
29-
compiler-nix-name = "ghc927"; # Not required for `stack.yaml` based projects.
29+
compiler-nix-name = "ghc928"; # Not required for `stack.yaml` based projects.
3030
}

‎docs/tutorials/getting-started-flakes/flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
helloProject =
1313
final.haskell-nix.project' {
1414
src = ./.;
15-
compiler-nix-name = "ghc927";
15+
compiler-nix-name = "ghc928";
1616
# This is used by `nix develop .` to open a shell for use with
1717
# `cabal`, `hlint` and `haskell-language-server`
1818
shell.tools = {

‎docs/tutorials/getting-started/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ in pkgs.haskell-nix.project {
2626
src = ./.;
2727
};
2828
# Specify the GHC version to use.
29-
compiler-nix-name = "ghc927"; # Not required for `stack.yaml` based projects.
29+
compiler-nix-name = "ghc928"; # Not required for `stack.yaml` based projects.
3030
}

‎flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
};
6666

6767
outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-2105, nixpkgs-2111, nixpkgs-2205, nixpkgs-2211, flake-utils, ... }@inputs:
68-
let compiler = "ghc927";
68+
let compiler = "ghc928";
6969
config = import ./config.nix;
7070

7171
traceNames = prefix: builtins.mapAttrs (n: v:

0 commit comments

Comments
 (0)