Skip to content

nix: add support for ghc 9.0.1 #1995

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 17 commits into from
Jul 4, 2021
Merged

nix: add support for ghc 9.0.1 #1995

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8df94c3
nix: add support for ghc 9.0.1
berberman Jul 2, 2021
c9f963d
Add CI
berberman Jul 2, 2021
978f060
Don't use overrideScope
berberman Jul 2, 2021
2126a15
Try to disable plugins properly
berberman Jul 2, 2021
66362b5
Avoid removing attrs of hpkgs
berberman Jul 2, 2021
0842b30
Split CI steps
berberman Jul 2, 2021
f0cb755
Jailbreak all ghc901 packages
berberman Jul 2, 2021
6d5b50b
Override `operational`
berberman Jul 2, 2021
75aaae0
Disable the test of `dual-tree`
berberman Jul 3, 2021
8e6e1ef
Override `dependent-sum-template`
berberman Jul 3, 2021
06387af
Disable tests for every ghc901 package
berberman Jul 3, 2021
05c9a8c
Remove formatters executables from dev shell
berberman Jul 3, 2021
53f3ad5
Disable pre-commit check for ghc901
berberman Jul 3, 2021
2962a7a
Override `diagrams` packages
berberman Jul 3, 2021
d7c7068
Override `monoid-extras`
berberman Jul 3, 2021
874f22b
Disable class plugin and refineImports plugin (consistent with cabal-…
berberman Jul 3, 2021
0b1735c
Merge branch 'master' into nix-901
berberman Jul 4, 2021
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
Try to disable plugins properly
  • Loading branch information
@berberman
berberman committed Jul 2, 2021
commit 2126a1571ad21228d6db8aab79cada901ff14388
25 changes: 13 additions & 12 deletions configuration-ghc-901.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ let
"hls-fourmolu-plugin"
"hls-splice-plugin"
"hls-ormolu-plugin"
"hls-eval-plugin"
];
hpkgsOverride = hself: hsuper:
with pkgs.haskell.lib;
Expand Down Expand Up @@ -84,17 +85,17 @@ let

ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_0_0_4;

# Disable plugins
# Re-generate HLS drv excluding some plugins
haskell-language-server =
appendConfigureFlags hsuper.haskell-language-server [
"-brittany"
"-eval"
"-fourmolu"
"-ormolu"
"-splice"
"-stylishhaskell"
"-tactic"
"-refineImports"
];
hself.callCabal2nixWithOptions "haskell-language-server" ./.
(pkgs.lib.concatStringsSep " " [
"-f-brittany"
"-f-eval"
"-f-fourmolu"
"-f-ormolu"
"-f-splice"
"-f-stylishhaskell"
"-f-tactic"
]) { };
};
in { tweakHpkgs = hpkgs: (removePluginPackages hpkgs).extend hpkgsOverride; }
in { tweakHpkgs = hpkgs: removePluginPackages (hpkgs.extend hpkgsOverride); }
2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
# we can remove sources attrs from hpkgs to exclude HLS plugins,
# so hpkgs may not be the superset of hlsSources
pipe (attrNames hlsSources) [
(xs: map (name: p.${name} or null) xs)
(xs: map (name: if hpkgs ? name then p.${name} else null) xs)
(xs: remove null xs)
];
buildInputs = [ gmp zlib ncurses capstone tracy (gen-hls-changelogs hpkgs) ]
Expand Down