Skip to content

Use latest GHC 9.2 and 9.4 in flake.nix #3354

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 1 commit into from
Nov 21, 2022
Merged

Use latest GHC 9.2 and 9.4 in flake.nix #3354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions configuration-ghc-90.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ let
# https://github.com/nikita-volkov/ptr-poker/issues/11
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };

ghc-lib = hself.ghc-lib_9_2_2_20220307;
ghc-lib = hself.ghc-lib_9_2_4_20220729;
ghc-lib-parser = hself.ghc-lib-parser_9_2_4_20220729;
ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_2_0_4;
ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_2_1_1;

Cabal = hself.Cabal_3_6_3_0;
ormolu = hself.ormolu_0_5_0_1;
fourmolu = hself.fourmolu_0_6_0_0;

# Hlint is still broken
hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint-34 { });

Expand Down
2 changes: 0 additions & 2 deletions configuration-ghc-92.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ let
# https://github.com/nikita-volkov/ptr-poker/issues/11
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };

ghc-exactprint =
hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint-150 { };
# Hlint is still broken
hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint { });

Expand Down
13 changes: 0 additions & 13 deletions configuration-ghc-94.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,6 @@ let

stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";

cereal = hsuper.callHackage "cereal" "0.5.8.3" {};
base-compat = hsuper.callHackage "base-compat" "0.12.2" {};
base-compat-batteries = hsuper.callHackage "base-compat-batteries" "0.12.2" {};
hashable = hsuper.callHackage "hashable" "1.4.1.0" {};
primitive = hsuper.callHackage "primitive" "0.7.4.0" {};
ghc-check = hsuper.callHackage "ghc-check" "0.5.0.8" {};
lens = hsuper.callHackage "lens" "5.2" {};
integer-logarithms = hsuper.callHackage "integer-logarithms" "1.0.3.1" {};
hiedb = hsuper.callHackage "hiedb" "0.4.2.0" {};
hie-bios = hsuper.callHackage "hie-bios" "0.11.0" {};
lsp = hsuper.callCabal2nix "lsp" inputs.lsp {};
lsp-types = hsuper.callCabal2nix "lsp-types" inputs.lsp-types {};

# Re-generate HLS drv excluding some plugins
haskell-language-server =
hself.callCabal2nixWithOptions "haskell-language-server" ./.
Expand Down
220 changes: 19 additions & 201 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading