diff --git a/ci.nix b/ci.nix index b6346c086e..d1ba37aefb 100644 --- a/ci.nix +++ b/ci.nix @@ -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 diff --git a/lazy-inputs/ghc912X/flake.lock b/lazy-inputs/ghc912X/flake.lock new file mode 100644 index 0000000000..16fbfe7e42 --- /dev/null +++ b/lazy-inputs/ghc912X/flake.lock @@ -0,0 +1,30 @@ +{ + "nodes": { + "ghc912X": { + "flake": false, + "locked": { + "lastModified": 1728948341, + "narHash": "sha256-yeIet7pwSkOngSTcm/E9XJAZhOalrfSbjVMOri/m1Ak=", + "ref": "ghc-9.12", + "rev": "ca2b21c3429a5ff780cb6c58c33c171a3c0af82b", + "revCount": 67355, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + }, + "original": { + "ref": "ghc-9.12", + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + } + }, + "root": { + "inputs": { + "ghc912X": "ghc912X" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/lazy-inputs/ghc912X/flake.nix b/lazy-inputs/ghc912X/flake.nix new file mode 100644 index 0000000000..ca7a84eea8 --- /dev/null +++ b/lazy-inputs/ghc912X/flake.nix @@ -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; +} diff --git a/lazy-inputs/ghc911/flake.lock b/lazy-inputs/ghc913/flake.lock similarity index 64% rename from lazy-inputs/ghc911/flake.lock rename to lazy-inputs/ghc913/flake.lock index 70d9dbcff2..00625dbdea 100644 --- a/lazy-inputs/ghc911/flake.lock +++ b/lazy-inputs/ghc913/flake.lock @@ -1,13 +1,13 @@ { "nodes": { - "ghc911": { + "ghc913": { "flake": false, "locked": { - "lastModified": 1729344855, - "narHash": "sha256-ZrvRXbvmMwlma+2YW2aHfSKnWzkwU/TF+TSVGRNqomM=", + "lastModified": 1729558540, + "narHash": "sha256-AgGMQro2YyO2qR7YTd1JuF4X1V14AUYsnakb+1BOGB0=", "ref": "refs/heads/master", - "rev": "a04959b8964c8d09897cfae1fd7b06ac53ebee95", - "revCount": 67445, + "rev": "148059fea534aced44649c739cd0fad4c25a99f0", + "revCount": 67457, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -20,7 +20,7 @@ }, "root": { "inputs": { - "ghc911": "ghc911" + "ghc913": "ghc913" } } }, diff --git a/lazy-inputs/ghc911/flake.nix b/lazy-inputs/ghc913/flake.nix similarity index 92% rename from lazy-inputs/ghc911/flake.nix rename to lazy-inputs/ghc913/flake.nix index 7ad2912908..db172cc218 100644 --- a/lazy-inputs/ghc911/flake.nix +++ b/lazy-inputs/ghc913/flake.nix @@ -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"; }; diff --git a/overlays/bootstrap.nix b/overlays/bootstrap.nix index fea20355d7..bd2a7e327a 100644 --- a/overlays/bootstrap.nix +++ b/overlays/bootstrap.nix @@ -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 = @@ -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) @@ -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) @@ -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. @@ -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 { diff --git a/overlays/fetch-source.nix b/overlays/fetch-source.nix index 26c0dafb30..68215b67f3 100644 --- a/overlays/fetch-source.nix +++ b/overlays/fetch-source.nix @@ -41,6 +41,6 @@ in { } // { lastModifiedDate = formatSecondsSinceEpoch lockFile.nodes.${name}.locked.lastModified; }; - }) ["ghc910X" "ghc911"]); + }) ["ghc912X" "ghc913"]); }; }