JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haskell-src-exts: remove unnecessary overrides

Browse Source 
The 1.20.2 release is now the default.
This commit is contained in:
Michael Alan Dorman 2018-03-14 19:49:44 -04:00 committed by Peter Simons
parent 80b209cf20
commit 41409f6348
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -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; });

6
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View File

@ -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: