Skip to content

Commit 4d607f7

Browse files
authored
Use llvm12 instead of llvm9 for ghc 8.10+ (#2204)
1 parent bdffdcf commit 4d607f7

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

overlays/bootstrap.nix

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -427,8 +427,8 @@ in {
427427
inherit sphinx;
428428

429429
useLLVM = !final.stdenv.targetPlatform.isx86;
430-
buildLlvmPackages = final.buildPackages.llvmPackages_9;
431-
llvmPackages = final.llvmPackages_9;
430+
buildLlvmPackages = final.buildPackages.llvmPackages_12;
431+
llvmPackages = final.llvmPackages_12;
432432

433433
src-spec = rec {
434434
version = "8.10.1";
@@ -449,8 +449,8 @@ in {
449449
inherit sphinx;
450450

451451
useLLVM = !final.stdenv.targetPlatform.isx86;
452-
buildLlvmPackages = final.buildPackages.llvmPackages_9;
453-
llvmPackages = final.llvmPackages_9;
452+
buildLlvmPackages = final.buildPackages.llvmPackages_12;
453+
llvmPackages = final.llvmPackages_12;
454454

455455
src-spec = rec {
456456
version = "8.10.2";
@@ -471,8 +471,8 @@ in {
471471
inherit sphinx;
472472

473473
useLLVM = !final.stdenv.targetPlatform.isx86;
474-
buildLlvmPackages = final.buildPackages.llvmPackages_9;
475-
llvmPackages = final.llvmPackages_9;
474+
buildLlvmPackages = final.buildPackages.llvmPackages_12;
475+
llvmPackages = final.llvmPackages_12;
476476

477477
src-spec = rec {
478478
version = "8.10.3";
@@ -493,8 +493,8 @@ in {
493493
inherit sphinx;
494494

495495
useLLVM = !final.stdenv.targetPlatform.isx86;
496-
buildLlvmPackages = final.buildPackages.llvmPackages_9;
497-
llvmPackages = final.llvmPackages_9;
496+
buildLlvmPackages = final.buildPackages.llvmPackages_12;
497+
llvmPackages = final.llvmPackages_12;
498498

499499
src-spec = rec {
500500
version = "8.10.4";
@@ -515,8 +515,8 @@ in {
515515
inherit sphinx;
516516

517517
useLLVM = !final.stdenv.targetPlatform.isx86;
518-
buildLlvmPackages = final.buildPackages.llvmPackages_9;
519-
llvmPackages = final.llvmPackages_9;
518+
buildLlvmPackages = final.buildPackages.llvmPackages_12;
519+
llvmPackages = final.llvmPackages_12;
520520

521521
src-spec = rec {
522522
version = "8.10.5";
@@ -537,8 +537,8 @@ in {
537537
inherit sphinx;
538538

539539
useLLVM = !final.stdenv.targetPlatform.isx86;
540-
buildLlvmPackages = final.buildPackages.llvmPackages_9;
541-
llvmPackages = final.llvmPackages_9;
540+
buildLlvmPackages = final.buildPackages.llvmPackages_12;
541+
llvmPackages = final.llvmPackages_12;
542542

543543
src-spec = rec {
544544
version = "8.10.6";
@@ -581,8 +581,8 @@ in {
581581
inherit sphinx;
582582

583583
useLLVM = !final.stdenv.targetPlatform.isx86;
584-
buildLlvmPackages = final.buildPackages.llvmPackages_9;
585-
llvmPackages = final.llvmPackages_9;
584+
buildLlvmPackages = final.buildPackages.llvmPackages_12;
585+
llvmPackages = final.llvmPackages_12;
586586

587587
src-spec = rec {
588588
version = "9.0.1";
@@ -603,8 +603,8 @@ in {
603603
inherit sphinx;
604604

605605
useLLVM = !final.stdenv.targetPlatform.isx86;
606-
buildLlvmPackages = final.buildPackages.llvmPackages_9;
607-
llvmPackages = final.llvmPackages_9;
606+
buildLlvmPackages = final.buildPackages.llvmPackages_12;
607+
llvmPackages = final.llvmPackages_12;
608608

609609
src-spec = rec {
610610
version = "9.0.2";

0 commit comments

Comments
 (0)