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

Merge pull request #35905 from deepfire/ghc-8.4

Browse Source 
GHC 8.4 configuration: trim outdated overrides
This commit is contained in:
Peter Simons 2018-02-28 10:33:37 +01:00 committed by GitHub
commit 7a4024629d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,16 +42,6 @@ self: super: {
unix = null;
xhtml = null;
# Undo the override in `configuration-common.nix`: GHC 8.4 bumps Cabal to 2.1:
# Distribution/Simple/CCompiler.hs:64:10: error:
# • No instance for (Semigroup CDialect)
# arising from the superclasses of an instance declaration
# • In the instance declaration for ‘Monoid CDialect’
# |
# 64 | instance Monoid CDialect where
# | ^^^^^^^^^^^^^^^
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal; }; #pkgs.haskell.packages.ghc822.jailbreak-cabal;
## Shadowed:
## Needs bump to a versioned attribute
@ -66,7 +56,7 @@ self: super: {
## Setup: Encountered missing dependencies:
## ghc >=7.0 && <8.4
##
## uncaught exception: IOException of type NoSuchThing (test/integration/testImport: changeWorkingDirectory: does not exist (No such file or directory))
## uncaught exception: IOException of type NoSuchThing (cabal: rawSystem: runInteractiveProcess: exec: does not exist (No such file or directory))
doCheck = false;
});
@ -77,6 +67,8 @@ self: super: {
free = super.free_5;
## Needs bump to a versioned attribute
## Setup: Encountered missing dependencies:
## base >=3 && <4.11
## Needed for (<>) in prelude
funcmp = super.funcmp_1_9;
@ -107,9 +99,8 @@ self: super: {
});
## Needs bump to a versioned attribute
## breaks hspec:
## Setup: Encountered missing dependencies:
## hspec-discover ==2.4.7
## hspec-discover ==2.4.8
hspec-discover = super.hspec-discover_2_4_8;
## Needs bump to a versioned attribute
@ -117,9 +108,6 @@ self: super: {
## free ==4.*, template-haskell >=2.4 && <2.13
lens = super.lens_4_16;
## Needs bump to a versioned attribute
QuickCheck = super.QuickCheck_2_11_3;
## Needs bump to a versioned attribute
## Setup: Encountered missing dependencies:
## doctest >=0.11.1 && <0.14
@ -575,6 +563,13 @@ self: super: {
jailbreak = true;
});
cabal2nix = super.cabal2nix.override {
## • No instance for (Semigroup (List a))
## arising from the 'deriving' clause of a data type declaration
## Possible fix:
hpack = self.hpack;
};
cabal-doctest = overrideCabal super.cabal-doctest (drv: {
## Setup: Encountered missing dependencies:
## Cabal >=1.10 && <2.1, base >=4.3 && <4.11
@ -588,6 +583,8 @@ self: super: {
});
deepseq-generics = overrideCabal super.deepseq-generics (drv: {
## Setup: Encountered missing dependencies:
## base >=4.5 && <4.11
## https://github.com/haskell-hvr/deepseq-generics/pull/4
jailbreak = true;
});
@ -635,6 +632,14 @@ self: super: {
jailbreak = true;
});
jailbreak-cabal = super.jailbreak-cabal.override {
## • No instance for (Semigroup CDialect)
## arising from the superclasses of an instance declaration
## • In the instance declaration for ‘Monoid CDialect’
## Undo the override in `configuration-common.nix`: GHC 8.4 bumps Cabal to 2.1:
Cabal = self.Cabal;
};
kan-extensions = overrideCabal super.kan-extensions (drv: {
## Setup: Encountered missing dependencies:
## free ==4.*
@ -671,13 +676,6 @@ self: super: {
jailbreak = true;
});
## Issue: https://github.com/pcapriotti/optparse-applicative/issues/288
optparse-applicative = overrideCabal super.optparse-applicative (drv: {
## Setup: Encountered missing dependencies:
## QuickCheck >=2.8 && <2.11
doCheck = false;
});
quickcheck-instances = overrideCabal super.quickcheck-instances (drv: {
## Setup: Encountered missing dependencies:
## base >=4.5 && <4.11
@ -704,7 +702,7 @@ self: super: {
tasty-hedgehog = overrideCabal super.tasty-hedgehog (drv: {
## Setup: Encountered missing dependencies:
## base >=4.8 && <4.11, tasty ==0.11.*
## base >=4.8 && <4.11
jailbreak = true;
});
@ -731,12 +729,6 @@ self: super: {
jailbreak = true;
});
th-abstraction = overrideCabal super.th-abstraction (drv: {
## Setup: Encountered missing dependencies:
## template-haskell >=2.5 && <2.13
jailbreak = true;
});
these = overrideCabal super.these (drv: {
## Setup: Encountered missing dependencies:
## base >=4.5 && <4.11