Skip to content

Commit c60ed7f

Browse files
committed
Drop Hadrian Materialization
Maintaining these plans is a bit difficult. For instance with #2338 the use of GHC 9.6.6 instead of 9.6.4 for building hadrian requires different plans for 9.8.2 and 9.8.4. Now that we are using a prebuilt static version of nix-tools, there should be less overhead in calculating these plans.
1 parent 2018e71 commit c60ed7f

File tree

429 files changed

+0
-35062
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

429 files changed

+0
-35062
lines changed

compiler/ghc/default.nix

-19
Original file line numberDiff line numberDiff line change
@@ -262,25 +262,6 @@ let
262262
buildPackages.haskell-nix.tool compiler-nix-name "hadrian" {
263263
compilerSelection = p: p.haskell.compiler;
264264
index-state = buildPackages.haskell-nix.internalHackageIndexState;
265-
# Verions of hadrian that comes with 9.6 depends on `time`
266-
materialized =
267-
if builtins.compareVersions ghc-version "9.4" < 0
268-
then ../../materialized/${compiler-nix-name}/hadrian-ghc92
269-
else if builtins.compareVersions ghc-version "9.4.8" < 0
270-
then ../../materialized/${compiler-nix-name}/hadrian-ghc947
271-
else if builtins.compareVersions ghc-version "9.6" < 0
272-
then ../../materialized/${compiler-nix-name}/hadrian-ghc94
273-
else if builtins.compareVersions ghc-version "9.6.5" < 0
274-
then ../../materialized/${compiler-nix-name}/hadrian-ghc964
275-
else if builtins.compareVersions ghc-version "9.8" < 0
276-
then ../../materialized/${compiler-nix-name}/hadrian-ghc96
277-
else if builtins.compareVersions ghc-version "9.8.2" < 0
278-
then ../../materialized/${compiler-nix-name}/hadrian-ghc981
279-
else if builtins.compareVersions ghc-version "9.9" < 0
280-
then ../../materialized/${compiler-nix-name}/hadrian-ghc98
281-
else if builtins.compareVersions ghc-version "9.11" < 0
282-
then ../../materialized/${compiler-nix-name}/hadrian-ghc910
283-
else null;
284265
modules = [{
285266
reinstallableLibGhc = false;
286267
# Apply the patches in a way that does not require using something

materialized/ghc8107/hadrian-ghc92/hadrian/.plan.nix/hadrian.nix

-157
This file was deleted.

0 commit comments

Comments
 (0)