b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

haskellPackages: drop more obsolete overrides

Browse source
This commit is contained in:
maralorn 2023-06-29 02:45:56 +02:00
parent bfe0cb4ebd
commit 28cd493da3
No known key found for this signature in database
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -139,10 +139,7 @@ self: super: {
# For -fghc-lib see cabal.project in haskell-language-server.
stylish-haskell = if lib.versionAtLeast super.ghc.version "9.2"
then enableCabalFlag "ghc-lib"
(if lib.versionAtLeast super.ghc.version "9.4"
then super.stylish-haskell_0_14_4_0
else super.stylish-haskell)
then enableCabalFlag "ghc-lib" super.stylish-haskell
else super.stylish-haskell;
###########################################
@ -724,11 +721,6 @@ self: super: {
# else dontCheck super.doctest-discover);
doctest-discover = dontCheck super.doctest-discover;
# Test suite is missing an import from hspec
# https://github.com/haskell-works/tasty-discover/issues/9
# https://github.com/commercialhaskell/stackage/issues/6584#issuecomment-1326522815
tasty-discover = assert super.tasty-discover.version == "4.2.2"; dontCheck super.tasty-discover;
# Too strict lower bound on tasty-hedgehog
# https://github.com/qfpl/tasty-hedgehog/issues/70
tasty-sugar = doJailbreak super.tasty-sugar;

1
pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
View file

@ -150,7 +150,6 @@ in {
# 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
hiedb = dontCheck super.hiedb;
hlint = self.hlint_3_5;
hls-hlint-plugin = super.hls-hlint-plugin.override {
inherit (self) hlint;
};