Skip to content

ghc 9.2.7, ghc 9.6.1 and replace old-ghc-nix with nixpkgs ghc #1854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 119 commits into from
Mar 16, 2023
Merged

ghc 9.2.7, ghc 9.6.1 and replace old-ghc-nix with nixpkgs ghc #1854

Changes from 1 commit
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
f8669c6
Try ghc 9.6.1 alpha
hamishmack Feb 20, 2023
f58ea62
Fixes for ghc 9.6
hamishmack Feb 21, 2023
46d7d3b
Fix internal index state
hamishmack Feb 22, 2023
2d56575
Update materialization
hamishmack Feb 22, 2023
66060e3
Use nixpkgs ghc instead of old-ghc-nix
hamishmack Feb 23, 2023
28499fc
Update more materialization
hamishmack Feb 23, 2023
8f3c667
Update more materialization
hamishmack Feb 23, 2023
7ef0694
Fix rename error
hamishmack Feb 23, 2023
a3ce990
Fix infinite recursion
hamishmack Feb 23, 2023
0fe1aa1
Fixes for hydra eval
hamishmack Feb 23, 2023
a652c1b
Fixes for hydra eval
hamishmack Feb 23, 2023
b914628
Use ghc902 to boot ghc 9.2
hamishmack Feb 23, 2023
f3a46c2
Merge remote-tracking branch 'origin/master' into hkm/ghc961
hamishmack Feb 23, 2023
5502054
Merge remote-tracking branch 'origin/master' into hkm/ghc961
hamishmack Feb 26, 2023
28deee0
Use hadrian for ghc 9.2
hamishmack Feb 26, 2023
b083bbd
Materialized files
hamishmack Feb 26, 2023
257f3ac
Fix for hadrian from ghc 9.2
hamishmack Feb 27, 2023
77008cd
Add ghc 9.2.7 and update materialization
hamishmack Feb 28, 2023
a67e9af
Add materialization
hamishmack Feb 28, 2023
49fc575
Add materialization
hamishmack Mar 1, 2023
57e0394
Add materialization
hamishmack Mar 1, 2023
9b5f239
Add materialization
hamishmack Mar 1, 2023
b2a6a49
Merge remote-tracking branch 'origin/master' into hkm/ghc961
hamishmack Mar 1, 2023
f0c89ab
ifdLevel 1
hamishmack Mar 2, 2023
abbb57c
ifdLevel 2
hamishmack Mar 2, 2023
eab64e2
ifdLevel 3
hamishmack Mar 2, 2023
a9eec3a
ifdLevel 1
hamishmack Mar 2, 2023
bbecc03
More fixes for ghc 9.6.1 alpha
hamishmack Mar 6, 2023
efc328a
Add materialization
hamishmack Mar 6, 2023
95026ab
Add materialization
hamishmack Mar 6, 2023
2d061f9
Add materialization
hamishmack Mar 6, 2023
c26a576
Merge remote-tracking branch 'origin/master' into hkm/ghc961
hamishmack Mar 6, 2023
74f0d93
ifdLevel 2
hamishmack Mar 6, 2023
95d8e03
Add materialization
hamishmack Mar 6, 2023
b99dd67
Build boot tools (except cabal-install) with nixpkgs ghc
hamishmack Mar 7, 2023
a8b184c
Fixes for compilerSelection
hamishmack Mar 7, 2023
bf30988
Merge combined derivations work
hamishmack Mar 8, 2023
ecf1ce9
Build cabal-install with haskell-nix when necessary
hamishmack Mar 8, 2023
d414b58
ifdLevel 0
hamishmack Mar 8, 2023
18e631e
Merge remote-tracking branch 'origin/master' into hkm/ghc961
hamishmack Mar 8, 2023
19c2aae
Bump to ghc 9.6.1 alpha 3
hamishmack Mar 8, 2023
4418a7c
Update materialization
hamishmack Mar 9, 2023
afb4bb8
Move materialized dummy-ghc-data onto ghc derivation
hamishmack Mar 9, 2023
9c17820
Merge remote-tracking branch 'origin/master' into hkm/ghc961
hamishmack Mar 9, 2023
95cbaa0
Update latest ghc 9.2 version
hamishmack Mar 9, 2023
8ce4cb5
Update materialization
hamishmack Mar 9, 2023
3ec9a3b
Fix check materialization script
hamishmack Mar 9, 2023
12a2f53
Update materialization
hamishmack Mar 9, 2023
2d1b809
ifdLevel 1
hamishmack Mar 9, 2023
6a23931
ifdLevel 2
hamishmack Mar 9, 2023
f5c50a0
Fix call-cabal-project-to-nix test
hamishmack Mar 9, 2023
b40b704
Try including all jobs for hydra (not aggregating)
hamishmack Mar 9, 2023
b4dddbd
Fix hls tests
hamishmack Mar 9, 2023
a8b3304
Fix hls tests
hamishmack Mar 9, 2023
9cb9f1c
ifdLevel 3
hamishmack Mar 10, 2023
6af52e7
Merge remote-tracking branch 'origin/master' into hkm/ghc961
hamishmack Mar 10, 2023
32101ad
Update ghc-packages.nix
angerman Mar 10, 2023
45ad41b
Update overlays/ghc-packages.nix
angerman Mar 10, 2023
5a1d0ca
Only use Cabal from ghc source with 9.6
hamishmack Mar 11, 2023
e5859d8
Updated materialization
hamishmack Mar 11, 2023
f3725b1
Only use Cabal from ghc source with 9.6
hamishmack Mar 11, 2023
fba2882
Test fix
hamishmack Mar 11, 2023
3292d69
Add cabal-install as well.
angerman Mar 12, 2023
9717245
Use Cabal 3.8
hamishmack Mar 12, 2023
40ad1cc
Remove unnecessary constraint
hamishmack Mar 12, 2023
d3de349
Merge remote-tracking branch 'origin/master' into hkm/ghc961
hamishmack Mar 12, 2023
cc64adb
Try four cabal packages
hamishmack Mar 12, 2023
f6502df
Fix cabal-simple test
hamishmack Mar 12, 2023
71c53a3
Fix compiler-nix-name
hamishmack Mar 12, 2023
620a5aa
Focus tests on new copilers for now
hamishmack Mar 12, 2023
6c3fa47
Fixes for tests that use aeson
hamishmack Mar 12, 2023
83912c5
Exclude cabal from ghc-extra-pkgs-cabal-projects
hamishmack Mar 12, 2023
f223160
Add ghc materialization for ghc 9.2.7 arm cross compilation
hamishmack Mar 12, 2023
17ef430
Fixes for ghc 9.6
hamishmack Mar 12, 2023
6329b77
More materialized files
hamishmack Mar 12, 2023
0c6b625
Add missing commas
hamishmack Mar 12, 2023
830a396
More materialized files
hamishmack Mar 12, 2023
3dfab7f
Add GHC 9.6.1 release
hamishmack Mar 12, 2023
97fa2a2
Add other platforms back
hamishmack Mar 12, 2023
0b759e6
Fix for ghc 9.6.1 and materialized files
hamishmack Mar 13, 2023
461ddef
More materialized files
hamishmack Mar 13, 2023
aec8ad5
More materialized files
hamishmack Mar 13, 2023
255feba
ifdLevel 1
hamishmack Mar 13, 2023
7483df6
Remove ghc-extra-projects-nix from roots
hamishmack Mar 13, 2023
a4d2b99
Fix compiler materialization script
hamishmack Mar 13, 2023
15dead6
More materialized files
hamishmack Mar 13, 2023
8777ddd
ifdLevel 2
hamishmack Mar 13, 2023
45ab39c
ifdLevel 3
hamishmack Mar 13, 2023
3163797
Include workarounds for ghc961
hamishmack Mar 13, 2023
94a96dd
Turn ci for older ghc versions back on
hamishmack Mar 13, 2023
0080fce
Install deriveConstants and genprimopcode along ghc
angerman Mar 13, 2023
7530767
Fix for ghc 9.4
hamishmack Mar 13, 2023
792000c
Check that Setup is copied correctly to $out
hamishmack Mar 13, 2023
2c2f670
ifdLevel 0
hamishmack Mar 13, 2023
368ffc0
ifdLevel 1
hamishmack Mar 13, 2023
6d81a89
ifdLevel 2
hamishmack Mar 13, 2023
827b5db
ifdLevel 3
angerman Mar 14, 2023
b53eda4
Update with-packages
hamishmack Mar 14, 2023
dbadcc7
allow newer shipped pkgs
angerman Mar 14, 2023
0bc22fd
Add component.shell
hamishmack Mar 14, 2023
f22ee1d
Make component.shell work with cd $(mktemp) && genericBuild
hamishmack Mar 14, 2023
4a168e2
Fix with-packages test
hamishmack Mar 14, 2023
f127324
Fix with-packages test
hamishmack Mar 14, 2023
4c5c70e
Skip broken th dll tests
hamishmack Mar 14, 2023
2083736
Fix with-packages test for ghc 9.6
hamishmack Mar 15, 2023
32bb37f
Bump stack version
hamishmack Mar 15, 2023
9f975fe
Skip hlint and hls for ghc 9.6
hamishmack Mar 15, 2023
76fedaf
Fix index-state test
hamishmack Mar 15, 2023
19d1cca
Skip broken tools
hamishmack Mar 15, 2023
3904e13
Fix for dwarf support
hamishmack Mar 15, 2023
8d2bbcc
Add requiredJobs for testing evalPlatform
hamishmack Mar 15, 2023
4a005ff
Add requiredJobs for testing evalPlatform
hamishmack Mar 15, 2023
a528765
Fix for eval test
hamishmack Mar 15, 2023
197e42e
Fix truncate index check
hamishmack Mar 15, 2023
638768b
Merge remote-tracking branch 'origin/master' into hkm/ghc961
hamishmack Mar 15, 2023
099bd53
Test more cross compilation
hamishmack Mar 15, 2023
88db87c
Fix for cabal-install 3.10.1.0
hamishmack Mar 15, 2023
d3fd7ee
Updated materialized files
hamishmack Mar 15, 2023
a15ae51
fix: final.*Platform -> final.stdenv.*Platform. (#1878)
dhess Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update ghc-packages.nix 
Add Cabal to the ghc-packages
  • Loading branch information
@angerman
angerman authored Mar 10, 2023
commit 32101ad44e1a0fc81137b58d830d2080fc505e21
1 change: 1 addition & 0 deletions overlays/ghc-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ let
libiserv = "libraries/libiserv";
template-haskell = "libraries/template-haskell";
iserv = "utils/iserv";
Cabal = "libraries/Cabal";
} // final.lib.optionalAttrs (!final.stdenv.hostPlatform.isGhcjs) {
ghc = "compiler";
ghc-boot = "libraries/ghc-boot";
Expand Down