Skip to content

Commit

Permalink
Use github:stable-haskell/ghc/ghc-*-iog (#2221)
Browse files Browse the repository at this point in the history
* Use github:stable-haskell/ghc/ghc-*-iog

* Use new happy for ghc 9.2

* Fix supported-languages dummy output

* Fix ghc plugin tests

* Disable mingwW64 for GHC HEAD (patches needed to build it no longer apply cleanly and the fix is not clear)

* Add missing evalPackages to js-template-haskell test
  • Loading branch information
hamishmack authored Jun 27, 2024
1 parent 6e9c388 commit f1ed0f9
Show file tree
Hide file tree
Showing 69 changed files with 1,329 additions and 245 deletions.
2 changes: 1 addition & 1 deletion ci.nix
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
inherit (lib.systems.examples) ghcjs;
} // lib.optionalAttrs (
(__match ".*llvm" compiler-nix-name == null)
&& ((system == "x86_64-linux" && !builtins.elem compiler-nix-name ["ghc884"])
&& ((system == "x86_64-linux" && !builtins.elem compiler-nix-name ["ghc884" "ghc91120240620"]) # Including GHC HEAD here because the patches for rts/RtsSymbols.c no longer apply and mingwW64 GHC build fails without them
|| (system == "x86_64-darwin" && builtins.elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
inherit (lib.systems.examples) mingwW64;
} // lib.optionalAttrs (nixpkgsName == "unstable"
Expand Down
39 changes: 0 additions & 39 deletions flake.lock

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

8 changes: 0 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
# And later it breaks in th-dll due to some change in the windows libs. We should probably
# drop unsable.
nixpkgs-unstable = { url = "github:NixOS/nixpkgs?rev=47585496bcb13fb72e4a90daeea2f434e2501998"; }; # nixpkgs-unstable };
ghc910X = {
flake = false;
url = "git+https://gitlab.haskell.org/ghc/ghc?ref=ghc-9.10&submodules=1";
};
ghc911 = {
flake = false;
url = "git+https://gitlab.haskell.org/ghc/ghc?submodules=1";
};
flake-compat = { url = "github:input-output-hk/flake-compat/hkm/gitlab-fix"; flake = false; };
"hls-1.10" = { url = "github:haskell/haskell-language-server/1.10.0.0"; flake = false; };
"hls-2.0" = { url = "github:haskell/haskell-language-server/2.0.0.1"; flake = false; };
Expand Down
36 changes: 36 additions & 0 deletions lazy-inputs/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
final: prev:
let
callFlake = import prev.haskell-nix.sources.flake-compat;
in {
haskell-nix = prev.haskell-nix // {
sources = prev.haskell-nix.sources // {
inherit ((callFlake { pkgs = final; src = ./ghc8107; }).defaultNix) ghc8107;
inherit ((callFlake { pkgs = final; src = ./ghc901; }).defaultNix) ghc901;
inherit ((callFlake { pkgs = final; src = ./ghc902; }).defaultNix) ghc902;
inherit ((callFlake { pkgs = final; src = ./ghc921; }).defaultNix) ghc921;
inherit ((callFlake { pkgs = final; src = ./ghc922; }).defaultNix) ghc922;
inherit ((callFlake { pkgs = final; src = ./ghc923; }).defaultNix) ghc923;
inherit ((callFlake { pkgs = final; src = ./ghc924; }).defaultNix) ghc924;
inherit ((callFlake { pkgs = final; src = ./ghc925; }).defaultNix) ghc925;
inherit ((callFlake { pkgs = final; src = ./ghc926; }).defaultNix) ghc926;
inherit ((callFlake { pkgs = final; src = ./ghc927; }).defaultNix) ghc927;
inherit ((callFlake { pkgs = final; src = ./ghc928; }).defaultNix) ghc928;
inherit ((callFlake { pkgs = final; src = ./ghc941; }).defaultNix) ghc941;
inherit ((callFlake { pkgs = final; src = ./ghc942; }).defaultNix) ghc942;
inherit ((callFlake { pkgs = final; src = ./ghc943; }).defaultNix) ghc943;
inherit ((callFlake { pkgs = final; src = ./ghc944; }).defaultNix) ghc944;
inherit ((callFlake { pkgs = final; src = ./ghc945; }).defaultNix) ghc945;
inherit ((callFlake { pkgs = final; src = ./ghc946; }).defaultNix) ghc946;
inherit ((callFlake { pkgs = final; src = ./ghc947; }).defaultNix) ghc947;
inherit ((callFlake { pkgs = final; src = ./ghc948; }).defaultNix) ghc948;
inherit ((callFlake { pkgs = final; src = ./ghc961; }).defaultNix) ghc961;
inherit ((callFlake { pkgs = final; src = ./ghc962; }).defaultNix) ghc962;
inherit ((callFlake { pkgs = final; src = ./ghc963; }).defaultNix) ghc963;
inherit ((callFlake { pkgs = final; src = ./ghc964; }).defaultNix) ghc964;
inherit ((callFlake { pkgs = final; src = ./ghc965; }).defaultNix) ghc965;
inherit ((callFlake { pkgs = final; src = ./ghc981; }).defaultNix) ghc981;
inherit ((callFlake { pkgs = final; src = ./ghc982; }).defaultNix) ghc982;
inherit ((callFlake { pkgs = final; src = ./ghc9101; }).defaultNix) ghc9101;
};
};
}
30 changes: 30 additions & 0 deletions lazy-inputs/ghc8107/flake.lock

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

12 changes: 12 additions & 0 deletions lazy-inputs/ghc8107/flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
description = "Lazy Input for Haskell.nix";

inputs = {
ghc8107 = {
flake = false;
url = "git+https://github.com/stable-haskell/ghc?ref=ghc-8.10.7-iog&submodules=1";
};
};

outputs = inputs: inputs;
}
30 changes: 30 additions & 0 deletions lazy-inputs/ghc901/flake.lock

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

12 changes: 12 additions & 0 deletions lazy-inputs/ghc901/flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
description = "Lazy Input for Haskell.nix";

inputs = {
ghc901 = {
flake = false;
url = "git+https://github.com/stable-haskell/ghc?ref=ghc-9.0.1-iog&submodules=1";
};
};

outputs = inputs: inputs;
}
30 changes: 30 additions & 0 deletions lazy-inputs/ghc902/flake.lock

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

12 changes: 12 additions & 0 deletions lazy-inputs/ghc902/flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
description = "Lazy Input for Haskell.nix";

inputs = {
ghc902 = {
flake = false;
url = "git+https://github.com/stable-haskell/ghc?ref=ghc-9.0.2-iog&submodules=1";
};
};

outputs = inputs: inputs;
}
30 changes: 30 additions & 0 deletions lazy-inputs/ghc9101/flake.lock

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

12 changes: 12 additions & 0 deletions lazy-inputs/ghc9101/flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
description = "Lazy Input for Haskell.nix";

inputs = {
ghc9101 = {
flake = false;
url = "git+https://github.com/stable-haskell/ghc?ref=ghc-9.10.1-iog&submodules=1";
};
};

outputs = inputs: inputs;
}
29 changes: 29 additions & 0 deletions lazy-inputs/ghc911/flake.lock

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

12 changes: 12 additions & 0 deletions lazy-inputs/ghc911/flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
description = "Lazy Input for Haskell.nix";

inputs = {
ghc911 = {
flake = false;
url = "git+https://gitlab.haskell.org/ghc/ghc?submodules=1";
};
};

outputs = inputs: inputs;
}
30 changes: 30 additions & 0 deletions lazy-inputs/ghc921/flake.lock

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

12 changes: 12 additions & 0 deletions lazy-inputs/ghc921/flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
description = "Lazy Input for Haskell.nix";

inputs = {
ghc921 = {
flake = false;
url = "git+https://github.com/stable-haskell/ghc?ref=ghc-9.2.1-iog&submodules=1";
};
};

outputs = inputs: inputs;
}
Loading

0 comments on commit f1ed0f9

Please sign in to comment.