Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ci.nix
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@
ghc910llvm = false;
ghc912 = true;
ghc912llvm = true;
ghc913 = true;
ghc914X = true;
ghc915 = true;
})));
crossSystems = nixpkgsName: nixpkgs: compiler-nix-name:
# We need to use the actual nixpkgs version we're working with here, since the values
Expand Down
1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
systems = [
"x86_64-linux"
] ++ (if runningHydraEvalTest then [ ] else [
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
]);
Expand Down
4 changes: 2 additions & 2 deletions lazy-inputs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ in {
inherit ((callFlake { pkgs = final; src = ./ghc9102; }).defaultNix) ghc9102;
inherit ((callFlake { pkgs = final; src = ./ghc9121; }).defaultNix) ghc9121;
inherit ((callFlake { pkgs = final; src = ./ghc9122; }).defaultNix) ghc9122;
inherit ((callFlake { pkgs = final; src = ./ghc912X; }).defaultNix) ghc912X;
inherit ((callFlake { pkgs = final; src = ./ghc913; }).defaultNix) ghc913;
inherit ((callFlake { pkgs = final; src = ./ghc914X; }).defaultNix) ghc914X;
inherit ((callFlake { pkgs = final; src = ./ghc915; }).defaultNix) ghc915;
inherit ((callFlake { pkgs = final; src = ./libffi-wasm; }).defaultNix) libffi-wasm;
} // prev.haskell-nix.sources;
};
Expand Down
30 changes: 0 additions & 30 deletions lazy-inputs/ghc912X/flake.lock

This file was deleted.

30 changes: 30 additions & 0 deletions lazy-inputs/ghc914X/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
description = "Lazy Input for Haskell.nix";

inputs = {
ghc912X = {
ghc914X = {
flake = false;
url = "git+https://gitlab.haskell.org/ghc/ghc?ref=ghc-9.12&submodules=1";
url = "git+https://github.com/stable-haskell/ghc?ref=stable-ghc-9.14&submodules=1";
};
};

Expand Down
12 changes: 6 additions & 6 deletions lazy-inputs/ghc913/flake.lock → lazy-inputs/ghc915/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description = "Lazy Input for Haskell.nix";

inputs = {
ghc913 = {
ghc915 = {
flake = false;
url = "git+https://gitlab.haskell.org/ghc/ghc?submodules=1";
};
Expand Down
4 changes: 2 additions & 2 deletions overlays/bootstrap.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ let
};
gitInputs = {
ghc96X = "9.6.7";
ghc912X = "9.12.1";
ghc913 = "9.13";
ghc914X = "9.14.0";
ghc915 = "9.15";
};
versionToNixName = v: "ghc${builtins.replaceStrings ["."] [""] v}";
compilerNameMap =
Expand Down
Loading