Skip to content

Commit 4952abb

Browse files
TeofilChamishmack
andauthored
Add GHC-9.2.6 (#1842)
* Add GHC-9.2.6 * More ghc 9.2.6 changes * ifdLevel 0 * ifdLevel 1 * More aarch64 materialization * Add spdx 3.19 materialization * ifdLevel 2 * Remaining materialization files * ifdLevel 3 * More materialization --------- Co-authored-by: Hamish Mackenzie <[email protected]>
1 parent c08075e commit 4952abb

File tree

155 files changed

+27787
-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.

155 files changed

+27787
-23
lines changed

ci.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@
5454
ghc865 = false;
5555
ghc8107 = false;
5656
ghc902 = false;
57-
ghc925 = false;
57+
ghc926 = false;
5858
ghc944 = false;
5959
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
6060
ghc865 = false;
6161
ghc884 = false; # Native version is used to boot 9.0.1
6262
ghc8107 = true;
6363
ghc902 = false;
64-
ghc925 = true;
64+
ghc926 = true;
6565
ghc944 = true;
6666
}));
6767
crossSystems = nixpkgsName: nixpkgs: compiler-nix-name:
@@ -73,10 +73,10 @@
7373
|| (system == "x86_64-darwin" && __elem compiler-nix-name ["ghc8107"]))) {
7474
inherit (lib.systems.examples) ghcjs;
7575
} // lib.optionalAttrs (nixpkgsName == "unstable"
76-
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc925" "ghc944"])
76+
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc926" "ghc944"])
7777
|| (system == "x86_64-darwin" && __elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
7878
inherit (lib.systems.examples) mingwW64;
79-
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923" "ghc924" "ghc925"]) {
79+
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923" "ghc924" "ghc926"]) {
8080
# Musl cross only works on linux
8181
# aarch64 cross only works on linux
8282
inherit (lib.systems.examples) musl64 aarch64-multiplatform;

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 = "ghc925"; # Not required for `stack.yaml` based projects.
29+
compiler-nix-name = "ghc926"; # 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 = "ghc925";
15+
compiler-nix-name = "ghc926";
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 = "ghc925"; # Not required for `stack.yaml` based projects.
29+
compiler-nix-name = "ghc926"; # Not required for `stack.yaml` based projects.
3030
}

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
};
6969

7070
outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-2105, nixpkgs-2111, nixpkgs-2205, nixpkgs-2211, flake-utils, tullia, ... }@inputs:
71-
let compiler = "ghc925";
71+
let compiler = "ghc926";
7272
config = import ./config.nix;
7373
in {
7474
inherit config;

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

Lines changed: 1831 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.2.6-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.2.6-aarch64-darwin/ghc/info

Lines changed: 72 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.2.6-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.

0 commit comments

Comments
 (0)