Skip to content
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

haskell.packages.ghc910.haskell-language-server: fix package #337720

Merged
merged 1 commit into from
Aug 29, 2024
Merged

haskell.packages.ghc910.haskell-language-server: fix package #337720

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
13 changes: 10 additions & 3 deletions pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,14 @@ self: super: {
apply-refact = doDistribute self.apply-refact_0_14_0_0;
attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0;
extensions = doDistribute self.extensions_0_1_0_2;
fourmolu = doDistribute self.fourmolu_0_16_2_0;
hashable = doDistribute self.hashable_1_4_7_0;
integer-conversion = doDistribute self.integer-conversion_0_1_1;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_10_1_20240511;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_10_0_0;
lens = doDistribute self.lens_5_3_2;
lukko = doDistribute self.lukko_0_1_2;
ormolu = doDistribute self.ormolu_0_7_7_0;
primitive = doDistribute (dontCheck self.primitive_0_9_0_0); # tests introduce a recursive dependency via hspec
quickcheck-instances = doDistribute self.quickcheck-instances_0_3_31;
rebase = doDistribute self.rebase_1_21_1;
Expand All @@ -83,15 +86,15 @@ self: super: {
uuid-types = doDistribute self.uuid-types_1_0_6;

# A given major version of ghc-exactprint only supports one version of GHC.
ghc-exactprint = doDistribute self.ghc-exactprint_1_10_0_0;
ghc-exactprint_1_10_0_0 = addBuildDepends [
ghc-exactprint = doDistribute self.ghc-exactprint_1_9_0_0;
ghc-exactprint_1_9_0_0 = addBuildDepends [
self.Diff
self.extra
self.ghc-paths
self.silently
self.syb
self.HUnit
] super.ghc-exactprint_1_10_0_0;
] super.ghc-exactprint_1_9_0_0;

#
# Jailbreaks
Expand Down Expand Up @@ -120,4 +123,8 @@ self: super: {
lukko_0_1_2 = dontCheck super.lukko_0_1_2; # doesn't compile with tasty ==1.4.*
resolv = dontCheck super.resolv; # doesn't compile with filepath ==1.5.*
primitive-unlifted = dontCheck super.primitive-unlifted; # doesn't compile with primitive ==0.9.*

haskell-language-server = disableCabalFlag "retrie" (disableCabalFlag "hlint" (disableCabalFlag "stylishhaskel" (super.haskell-language-server.override {stylish-haskell = null;retrie = null;apply-refact=null;hlint = null;})));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to convert this to use lib.pipe as discussed on matrix?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think 3 is about the limit where doing directly still is acceptable.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, I personally use lib.pipe as soon as I hit 2 functions, but sure.



}
1 change: 1 addition & 0 deletions pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ extra-packages:
- ghc-exactprint == 1.5.* # 2023-03-30: needed for GHC == 9.2
- ghc-exactprint == 1.6.* # 2023-03-30: needed for GHC == 9.4
- ghc-exactprint == 1.8.* # 2024-05-20: needed for GHC == 9.8
- ghc-exactprint == 1.9.* # 2024-08-27: needed for GHC == 9.10
- ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0
- ghc-lib == 9.8.* # 2024-05-19: preserve for GHC 9.8
- ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0
Expand Down
13 changes: 13 additions & 0 deletions pkgs/development/haskell-modules/hackage-packages.nix
View file
Open in desktop

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