Skip to content

Commit 3d5d5eb

Browse files
committed
Add ghc914X and ghc915
1 parent c3380cc commit 3d5d5eb

File tree

7 files changed

+23
-22
lines changed

7 files changed

+23
-22
lines changed

ci.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@
7575
ghc910llvm = false;
7676
ghc912 = true;
7777
ghc912llvm = true;
78-
ghc913 = true;
78+
ghc914X = true;
79+
ghc915 = true;
7980
})));
8081
crossSystems = nixpkgsName: nixpkgs: compiler-nix-name:
8182
# We need to use the actual nixpkgs version we're working with here, since the values

lazy-inputs/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ in {
3939
inherit ((callFlake { pkgs = final; src = ./ghc9102; }).defaultNix) ghc9102;
4040
inherit ((callFlake { pkgs = final; src = ./ghc9121; }).defaultNix) ghc9121;
4141
inherit ((callFlake { pkgs = final; src = ./ghc9122; }).defaultNix) ghc9122;
42-
inherit ((callFlake { pkgs = final; src = ./ghc912X; }).defaultNix) ghc912X;
43-
inherit ((callFlake { pkgs = final; src = ./ghc913; }).defaultNix) ghc913;
42+
inherit ((callFlake { pkgs = final; src = ./ghc914X; }).defaultNix) ghc914X;
43+
inherit ((callFlake { pkgs = final; src = ./ghc915; }).defaultNix) ghc915;
4444
inherit ((callFlake { pkgs = final; src = ./libffi-wasm; }).defaultNix) libffi-wasm;
4545
} // prev.haskell-nix.sources;
4646
};

lazy-inputs/ghc912X/flake.lock renamed to lazy-inputs/ghc914X/flake.lock

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

lazy-inputs/ghc912X/flake.nix renamed to lazy-inputs/ghc914X/flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
description = "Lazy Input for Haskell.nix";
33

44
inputs = {
5-
ghc912X = {
5+
ghc914X = {
66
flake = false;
7-
url = "git+https://gitlab.haskell.org/ghc/ghc?ref=ghc-9.12&submodules=1";
7+
url = "git+https://gitlab.haskell.org/ghc/ghc?ref=ghc-9.14&submodules=1";
88
};
99
};
1010

lazy-inputs/ghc913/flake.lock renamed to lazy-inputs/ghc915/flake.lock

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

lazy-inputs/ghc913/flake.nix renamed to lazy-inputs/ghc915/flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
description = "Lazy Input for Haskell.nix";
33

44
inputs = {
5-
ghc913 = {
5+
ghc915 = {
66
flake = false;
77
url = "git+https://gitlab.haskell.org/ghc/ghc?submodules=1";
88
};

overlays/bootstrap.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ let
1515
};
1616
gitInputs = {
1717
ghc96X = "9.6.7";
18-
ghc912X = "9.12.1";
19-
ghc913 = "9.13";
18+
ghc914X = "9.14.0";
19+
ghc915 = "9.15";
2020
};
2121
versionToNixName = v: "ghc${builtins.replaceStrings ["."] [""] v}";
2222
compilerNameMap =

0 commit comments

Comments
 (0)