Skip to content

Commit ef02aea

Browse files
committed
Merge remote-tracking branch 'ncaq/add-ghc9103' into hkm/ghc9103
# Conflicts: # ci.nix
2 parents eb5f43c + f3529f2 commit ef02aea

File tree

31 files changed

+898
-112
lines changed

31 files changed

+898
-112
lines changed

ci.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@
8989
static = p: p.pkgsStatic;
9090
} // lib.optionalAttrs (nixpkgsName == "unstable"
9191
&& (__match ".*llvm" compiler-nix-name == null)
92-
&& !builtins.elem compiler-nix-name ["ghc9102"]) {
92+
&& !builtins.elem compiler-nix-name ["ghc9102" "ghc9103"]) {
9393
inherit (lib.systems.examples) ghcjs;
9494
} // lib.optionalAttrs (nixpkgsName == "unstable"
9595
&& (__match ".*llvm" compiler-nix-name == null)
96-
&& !builtins.elem compiler-nix-name ["ghc967" "ghc984" "ghc9102"]
96+
&& !builtins.elem compiler-nix-name ["ghc967" "ghc984" "ghc9102" "ghc9103"]
9797
&& system != "x86_64-darwin") {
9898
inherit (lib.systems.examples) wasi32;
9999
} // lib.optionalAttrs (nixpkgsName == "unstable"

docs/reference/supported-ghc-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ really should use an instance of Nixpkgs provided by `haskell.nix` itself.
2424
|------------------|--------------------|-------------|-----------------------|---------------|
2525
| unstable | `nixpkgs-unstable` | 9.6.7 | `ghc96` or `ghc967` | Yes |
2626
| unstable | `nixpkgs-unstable` | 9.8.4 | `ghc98` or `ghc984` | Yes |
27-
| unstable | `nixpkgs-unstable` | 9.10.2 | `ghc910` or `ghc9102` | Yes |
27+
| unstable | `nixpkgs-unstable` | 9.10.3 | `ghc910` or `ghc9103` | Yes |
2828
| unstable | `nixpkgs-unstable` | 9.12.2 | `ghc912` or `ghc9122` | Yes |
2929

3030
See [ci.nix](https://github.com/input-output-hk/haskell.nix/blob/master/ci.nix)

lazy-inputs/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ in {
3737
inherit ((callFlake { pkgs = final; src = ./ghc984; }).defaultNix) ghc984;
3838
inherit ((callFlake { pkgs = final; src = ./ghc9101; }).defaultNix) ghc9101;
3939
inherit ((callFlake { pkgs = final; src = ./ghc9102; }).defaultNix) ghc9102;
40+
inherit ((callFlake { pkgs = final; src = ./ghc9103; }).defaultNix) ghc9103;
4041
inherit ((callFlake { pkgs = final; src = ./ghc9121; }).defaultNix) ghc9121;
4142
inherit ((callFlake { pkgs = final; src = ./ghc9122; }).defaultNix) ghc9122;
4243
inherit ((callFlake { pkgs = final; src = ./ghc912X; }).defaultNix) ghc912X;

lazy-inputs/ghc9103/flake.lock

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

lazy-inputs/ghc9103/flake.nix

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
description = "Lazy Input for Haskell.nix";
3+
4+
inputs = {
5+
ghc9103 = {
6+
flake = false;
7+
url = "git+https://github.com/ghc/ghc?rev=3f4d7d38b9661435bdde981451ac50c4335ed090&submodules=1";
8+
};
9+
};
10+
11+
outputs = inputs: inputs;
12+
}

materialized/alex-3.2.7.1/ghc964/default.nix

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

0 commit comments

Comments
 (0)