Skip to content

Commit

Permalink
Replace ghc911 with ghc912X and ghc913
Browse files Browse the repository at this point in the history
  • Loading branch information
hamishmack committed Oct 22, 2024
1 parent ed42119 commit ea3fbac
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 14 deletions.
3 changes: 2 additions & 1 deletion ci.nix
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@
ghc98llvm = false;
ghc910 = true;
ghc910llvm = true;
ghc911 = true;
ghc912X = true;
ghc913 = 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
30 changes: 30 additions & 0 deletions lazy-inputs/ghc912X/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/ghc912X/flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
description = "Lazy Input for Haskell.nix";

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

outputs = inputs: inputs;
}
12 changes: 6 additions & 6 deletions lazy-inputs/ghc911/flake.lock → lazy-inputs/ghc913/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 = {
ghc911 = {
ghc913 = {
flake = false;
url = "git+https://gitlab.haskell.org/ghc/ghc?submodules=1";
};
Expand Down
11 changes: 6 additions & 5 deletions overlays/bootstrap.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ let
"9.10" = "9.10.1";
};
gitInputs = {
ghc911 = "9.11";
ghc912X = "9.12";
ghc913 = "9.13";
};
versionToNixName = v: "ghc${builtins.replaceStrings ["."] [""] v}";
compilerNameMap =
Expand Down Expand Up @@ -119,7 +120,7 @@ in {
++ until "9.2" ./patches/ghc/issue-18708.patch # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6554
++ fromUntil "9.2.2" "9.4" ./patches/ghc/ghc-9.2.2-fix-warnings-building-with-self.patch # https://gitlab.haskell.org/ghc/ghc/-/commit/c41c478eb9003eaa9fc8081a0039652448124f5d
++ until "9.6" ./patches/ghc/ghc-hpc-response-files.patch # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8194
++ fromUntil "9.2" "9.12" ./patches/ghc/sanity-check-find-file-name.patch
++ fromUntil "9.2" "9.14" ./patches/ghc/sanity-check-find-file-name.patch
++ until "9.0" ./patches/ghc/dont-mark-evacuate_large-as-inline.patch
++ onWindows (fromUntil "9.4.1" "9.4.5" ./patches/ghc/ghc-9.4-hadrian-win-cross.patch)
++ onWindows (fromUntil "9.4.7" "9.4.9" ./patches/ghc/ghc-9.8-hadrian-win-cross.patch)
Expand Down Expand Up @@ -159,7 +160,7 @@ in {
++ fromUntil "9.6.2" "9.8" ./patches/ghc/ghc-9.4.5-include-order-fix.patch
++ fromUntil "9.6.1" "9.9.20231203" ./patches/ghc/MR10116.patch
++ onNative (fromUntil "9.4.1" "9.6" ./patches/ghc/hadrian-build-deriveConstants-genprimopcode-ghc94.patch)
++ onNative (fromUntil "9.6.1" "9.12" ./patches/ghc/hadrian-build-deriveConstants-genprimopcode.patch)
++ onNative (fromUntil "9.6.1" "9.14" ./patches/ghc/hadrian-build-deriveConstants-genprimopcode.patch)
++ onGhcjs (fromUntil "9.6.1" "9.6.3" ./patches/ghc/ghc-9.6-Merge-libiserv-with-ghci.patch)
++ onGhcjs (fromUntil "9.6.3" "9.8" ./patches/ghc/ghc-9.6.3-Merge-libiserv-with-ghci.patch)
++ onGhcjs (fromUntil "9.6.1" "9.8" ./patches/ghc/ghc-9.6-Assorted-changes-to-avoid-head-tail.patch)
Expand Down Expand Up @@ -247,7 +248,7 @@ in {
++ fromUntil "9.9" "9.11" ./patches/ghc/ghc-9.9-Cabal-3.11.patch
++ fromUntil "9.8" "9.9" ./patches/ghc/ghc-9.8-text-upper-bound.patch
++ fromUntil "9.10" "9.11" ./patches/ghc/ghc-9.10-containers-upper-bound.patch
++ fromUntil "9.10" "9.12" ./patches/ghc/ghc-9.10-merge-objects.patch
++ fromUntil "9.10" "9.14" ./patches/ghc/ghc-9.10-merge-objects.patch

# This patch will make windows stop emitting absolute relocations. This is one way in which binutils 2.36+ (with ASLR enabled), will just choke on the
# assembly we generate because it's always absolute (32bit) addressing modes.
Expand All @@ -257,7 +258,7 @@ in {
++ onWindows (fromUntil "9.2" "9.4" ./patches/ghc/windows-pseudo-pic-9.2.patch)

# Fix issue loading windows dll using `.dll.a` file
++ onWindows (fromUntil "9.4" "9.12" ./patches/ghc/ghc-9.10-windows-dll-dependent-symbol-type-fix.patch)
++ onWindows (fromUntil "9.4" "9.14" ./patches/ghc/ghc-9.10-windows-dll-dependent-symbol-type-fix.patch)
;
in ({
ghc8107 = traceWarnOld "8.10" (final.callPackage ../compiler/ghc {
Expand Down
2 changes: 1 addition & 1 deletion overlays/fetch-source.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ in {
} // {
lastModifiedDate = formatSecondsSinceEpoch lockFile.nodes.${name}.locked.lastModified;
};
}) ["ghc910X" "ghc911"]);
}) ["ghc912X" "ghc913"]);
};
}

0 comments on commit ea3fbac

Please sign in to comment.