diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7e4efcd72ce4c..b168eab18c1ab 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1773,21 +1773,6 @@ self: super: { vivid-osc = dontCheck super.vivid-osc; vivid-supercollider = dontCheck super.vivid-supercollider; - # cabal-install switched to build type simple in 3.2.0.0 - # as a result, the cabal(1) man page is no longer installed - # automatically. Instead we need to use the `cabal man` - # command which generates the man page on the fly and - # install it to $out/share/man/man1 ourselves in this - # override. - # The commit that introduced this change: - # https://github.com/haskell/cabal/commit/91ac075930c87712eeada4305727a4fa651726e7 - cabal-install = overrideCabal (old: { - postInstall = old.postInstall + '' - mkdir -p "$out/share/man/man1" - "$out/bin/cabal" man --raw > "$out/share/man/man1/cabal.1" - ''; - }) super.cabal-install; - # while waiting for a new release: https://github.com/brendanhay/amazonka/pull/572 amazonka = appendPatches [ (fetchpatch { @@ -2417,13 +2402,12 @@ self: super: { })) ]; - # 2022-02-25: Not compatible with relude 1.0 - ema = assert super.ema.version == "0.6.0.0"; - super.ema.overrideScope (self: super: { relude = doJailbreak self.relude_0_7_0_0; }); + # Tests require ghc-9.2. + ema = dontCheck super.ema; - glirc = super.glirc.override { + glirc = doJailbreak (super.glirc.override { vty = self.vty_5_35_1; - }; + }); # 2022-02-25: Unmaintained and to strict upper bounds paths = doJailbreak super.paths; @@ -2492,11 +2476,6 @@ self: super: { sha256 = "sha256-fW5bVbAGQxU/gd9zqgVNclwKraBtUjkKDek7L0c4+O0="; }) super.wstunnel; - # Adjustment of bounds on servant is unreleased - # https://github.com/haskell-servant/servant-cassava/commit/66617547851d38d48f5f1d1b786db1286bdafa9d - servant-cassava = assert super.servant-cassava.version == "0.10.1"; - doJailbreak super.servant-cassava; - # Test data missing from sdist # https://github.com/ngless-toolkit/ngless/issues/152 NGLess = dontCheck super.NGLess; |