From 41409f634801083d0d2609894ee9d11f95b8248c Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 14 Mar 2018 19:49:44 -0400 Subject: [PATCH] haskell-src-exts: remove unnecessary overrides The 1.20.2 release is now the default. --- .../haskell-modules/configuration-common.nix | 11 +---------- .../haskell-modules/configuration-ghc-8.4.x.nix | 6 ------ 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 43e2b23841cd..6bf66cd659c7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -603,13 +603,10 @@ self: super: { ln -s $lispdir $data/share/emacs/site-lisp ''; doCheck = false; # https://github.com/chrisdone/hindent/issues/299 - })).override { - haskell-src-exts = self.haskell-src-exts_1_20_2; - }; + })); # Need newer versions of their dependencies than the ones we have in LTS-11.x. cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_0; hackage-db = self.hackage-db_2_0_1; }); - hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_2; }); # https://github.com/bos/configurator/issues/22 configurator = dontCheck super.configurator; @@ -847,15 +844,9 @@ self: super: { # Hoogle needs newer versions than lts-11 provides. lambdabot-haskell-plugins # depends on Hoogle and therefore needs to use the same version. - hoogle = super.hoogle.override { - haskell-src-exts = self.haskell-src-exts_1_20_2; - }; lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.override { haskell-src-exts-simple = self.haskell-src-exts-simple_1_20_0_0; }; - haskell-src-exts-simple_1_20_0_0 = super.haskell-src-exts-simple_1_20_0_0.override { - haskell-src-exts = self.haskell-src-exts_1_20_2; - }; # These packages depend on each other, forming an infinite loop. scalendar = markBroken (super.scalendar.override { SCalendar = null; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index d216e8a41a09..196888c2883d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -117,12 +117,6 @@ self: super: { doHaddock = false; }); - ## Needs bump to a versioned attribute - ## • Could not deduce (Semigroup (ParseResult m)) - ## arising from the superclasses of an instance declaration - ## from the context: Monoid m - haskell-src-exts = super.haskell-src-exts_1_20_2; - ## Needs bump to a versioned attribute hspec = overrideCabal super.hspec_2_4_8 (drv: { ## Setup: Encountered missing dependencies: