Skip to content

Commit

Permalink
haskell.packages.ghc910.haskell-language-server: fix package
Browse files Browse the repository at this point in the history
  • Loading branch information
eldritch-cookie committed Aug 27, 2024
1 parent 8894a16 commit f2d1b5c
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 6 deletions.
13 changes: 10 additions & 3 deletions pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix
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;})));


}
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
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,7 @@ dont-distribute-packages:
- category
- category-extras
- cattrap
- cauldron
- cctools-workqueue
- cef3-simple
- ceilometer-common
Expand Down Expand Up @@ -1418,6 +1419,9 @@ dont-distribute-packages:
- fpnla-examples
- frame-markdown
- freckle-app
- freckle-http
- freckle-memcached
- freckle-otel
- free-functors
- free-game
- free-theorems-seq-webui
Expand Down Expand Up @@ -2213,6 +2217,8 @@ dont-distribute-packages:
- hsyslog-tcp
- html-kure
- html2hamlet
- htmx-lucid
- htmx-servant
- htoml-parse
- htsn-import
- http-client-auth
Expand Down Expand Up @@ -2585,6 +2591,7 @@ dont-distribute-packages:
- list-t-html-parser
- list-tuple
- list-witnesses
- list1
- listenbrainz-client
- liszt
- lit
Expand Down Expand Up @@ -2913,7 +2920,7 @@ dont-distribute-packages:
- nonlinear-optimization-backprop
- not-gloss
- not-gloss-examples
- nothunks_0_2_1_1
- nothunks_0_3_0_0
- notmuch-web
- now-haskell
- nri-env-parser
Expand Down Expand Up @@ -2963,7 +2970,6 @@ dont-distribute-packages:
- opc-xml-da-client
- open-adt-tutorial
- open-typerep
- opencv-extra
- openpgp-Crypto
- openpgp-crypto-api
- openssh-github-keys
Expand Down Expand Up @@ -3463,6 +3469,7 @@ dont-distribute-packages:
- rv
- s-expression
- safe-coloured-text-layout-gen
- safe-coloured-text-layout-gen_0_0_0_1
- safe-coupling
- safe-failure
- safe-failure-cme
Expand Down Expand Up @@ -3820,8 +3827,10 @@ dont-distribute-packages:
- syb-with-class-instances-text
- sydtest-amqp
- sydtest-webdriver-screenshot
- sydtest-webdriver-screenshot_0_1_0_0
- sydtest-webdriver-yesod
- sydtest-yesod
- sydtest_0_17_0_0
- sylvia
- symantic-atom
- symantic-http-demo
Expand Down Expand Up @@ -4004,6 +4013,7 @@ dont-distribute-packages:
- type-sub-th
- typed-admin
- typed-encoding-encoding
- typed-gui
- typed-streams
- typedflow
- typelevel
Expand Down Expand Up @@ -4185,6 +4195,9 @@ dont-distribute-packages:
- wheb-strapped
- whitespace
- wholepixels
- wikimusic-api
- wikimusic-api-spec
- wikimusic-ssr
- wikipedia4epub
- wild-bind-indicator
- wild-bind-task-x11
Expand Down
25 changes: 24 additions & 1 deletion pkgs/development/haskell-modules/hackage-packages.nix

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

0 comments on commit f2d1b5c

Please sign in to comment.