Skip to content

Commit 86c0722

Browse files
committed
Remove some obsolete hackage-quirks
The `stlylish-haskell` plugin is updated and there was a `retrie` release.
1 parent bc1444e commit 86c0722

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

modules/hackage-quirks.nix

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,30 +41,20 @@ in [
4141
}
4242
)
4343

44-
# TODO remove this when `dependent-sum-0.7.1.0` constraint on `some` has been updated.
45-
# See https://github.com/haskell/haskell-language-server/issues/2969
46-
# and https://github.com/obsidiansystems/dependent-sum/issues/71
4744
({config, lib, pkgs, ...}:
4845
{ _file = "haskell.nix/overlays/hackage-quirks.nix#haskell-language-server"; } //
4946
lib.mkIf (config.name == "haskell-language-server") {
47+
# TODO remove this when `dependent-sum-0.7.1.0` constraint on `some` has been updated.
48+
# See https://github.com/haskell/haskell-language-server/issues/2969
49+
# and https://github.com/obsidiansystems/dependent-sum/issues/71
5050
cabalProject = lib.mkDefault (''
5151
packages: .
5252
constraints: dependent-sum >=0.7.1.0
5353
''
54-
# TODO remove once these two plugins have been updated in hackage
55-
+ lib.optionalString (config.version == "1.8.0.0") ''
56-
package haskell-language-server
57-
flags: -qualifyimportednames -stylishhaskell${lib.optionalString (config.compiler-nix-name != "ghc902") " -hlint"}
58-
''
5954
# TODO Remove this flag once the hls-haddock-comments-plugin is updated in hackage to work with ghc 9.2
6055
+ lib.optionalString (__elem config.compiler-nix-name ["ghc921" "ghc922" "ghc923" "ghc924" "ghc925"]) ''
6156
package haskell-language-server
6257
flags: -haddockcomments
63-
''
64-
# Exclude `retrie` that does not actually work with older versions of GHC.
65-
# TODO Remove this once https://github.com/facebookincubator/retrie/pull/51 is fixed somehow
66-
+ lib.optionalString (__elem config.compiler-nix-name ["ghc865" "ghc884" "ghc8105" "ghc8106" "ghc8107" "ghc901" "ghc902"]) ''
67-
constraints: retrie <1.2.1
6858
'');
6959
}
7060
)

0 commit comments

Comments
 (0)