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.

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
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Override operational
  • Loading branch information
berberman committed Jul 3, 2021
commit 6d5b50b68cb7b7e6cfca06a913eab49b26b2cba4
7 changes: 7 additions & 0 deletions cabal-ghc901.project
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,13 @@ source-repository-package
subdir: lsp-test
-- https://github.com/haskell/lsp/pull/312

-- benchmark dependency
source-repository-package
type: git
location: https://github.com/berberman/operational
tag: 0e062895678f49fd673ae493371262cfb8c5ab56
-- https://github.com/HeinrichApfelmus/operational/pull/26

write-ghc-environment-files: never

index-state: 2021-06-30T16:00:00Z
Expand Down
10 changes: 9 additions & 1 deletion configuration-ghc-901.nix
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,20 @@ let
hself.callCabal2nix "dependent-sum" "${dependent-sum-src}/dependent-sum"
{ };

hlint = hself.callCabal2nix "hlint" hlint_3_3_1-src { };
hlint = hself.hlint_3_3_1;

ghc-lib-parser = hself.ghc-lib-parser_9_0_1_20210324;

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

operational = hself.callCabal2nix "operational"
(pkgs.fetchFromGitHub {
owner = "berberman";
repo = "operational";
rev = "0e062895678f49fd673ae493371262cfb8c5ab56";
sha256 = "P+aocEcqCN8klnW3IMrmIqq6ztBZJxk4sBp1ewN6YaA=";
}) { };

# Re-generate HLS drv excluding some plugins
haskell-language-server =
hself.callCabal2nixWithOptions "haskell-language-server" ./.
Expand Down
5 changes: 5 additions & 0 deletions stack-9.0.1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ extra-deps:
commit: ca23431a8dfa013992f9164ccc882a3277361f17
# https://github.com/diagrams/active/pull/36

# benchmark dependency
- github: berberman/operational
commit: 0e062895678f49fd673ae493371262cfb8c5ab56
# https://github.com/HeinrichApfelmus/operational/pull/26

configure-options:
ghcide:
- --disable-library-for-ghci
Expand Down