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

ghc84: remove unused overrides & minor proof updates

Browse Source
This commit is contained in:
Kosyrev Serge 2018-02-27 03:20:15 +03:00
parent fe5183105a
commit f9c952f39c
No known key found for this signature in database
GPG Key ID: 3F62F118E38BED6D
1 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,16 +42,6 @@ self: super: {
unix = null; unix = null;
xhtml = 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: ## Shadowed:
## Needs bump to a versioned attribute ## Needs bump to a versioned attribute
@ -66,7 +56,7 @@ self: super: {
## Setup: Encountered missing dependencies: ## Setup: Encountered missing dependencies:
## ghc >=7.0 && <8.4 ## 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; doCheck = false;
}); });
@ -77,6 +67,8 @@ self: super: {
free = super.free_5; free = super.free_5;
## Needs bump to a versioned attribute ## Needs bump to a versioned attribute
## Setup: Encountered missing dependencies:
## base >=3 && <4.11
## Needed for (<>) in prelude ## Needed for (<>) in prelude
funcmp = super.funcmp_1_9; funcmp = super.funcmp_1_9;
@ -107,9 +99,8 @@ self: super: {
}); });
## Needs bump to a versioned attribute ## Needs bump to a versioned attribute
## breaks hspec:
## Setup: Encountered missing dependencies: ## Setup: Encountered missing dependencies:
## hspec-discover ==2.4.7 ## hspec-discover ==2.4.8
hspec-discover = super.hspec-discover_2_4_8; hspec-discover = super.hspec-discover_2_4_8;
## Needs bump to a versioned attribute ## Needs bump to a versioned attribute
@ -117,9 +108,6 @@ self: super: {
## free ==4.*, template-haskell >=2.4 && <2.13 ## free ==4.*, template-haskell >=2.4 && <2.13
lens = super.lens_4_16; lens = super.lens_4_16;
## Needs bump to a versioned attribute
QuickCheck = super.QuickCheck_2_11_3;
## Needs bump to a versioned attribute ## Needs bump to a versioned attribute
## Setup: Encountered missing dependencies: ## Setup: Encountered missing dependencies:
## doctest >=0.11.1 && <0.14 ## doctest >=0.11.1 && <0.14
@ -595,6 +583,8 @@ self: super: {
}); });
deepseq-generics = overrideCabal super.deepseq-generics (drv: { 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 ## https://github.com/haskell-hvr/deepseq-generics/pull/4
jailbreak = true; jailbreak = true;
}); });
@ -642,6 +632,14 @@ self: super: {
jailbreak = true; 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: { kan-extensions = overrideCabal super.kan-extensions (drv: {
## Setup: Encountered missing dependencies: ## Setup: Encountered missing dependencies:
## free ==4.* ## free ==4.*
@ -678,13 +676,6 @@ self: super: {
jailbreak = true; 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: { quickcheck-instances = overrideCabal super.quickcheck-instances (drv: {
## Setup: Encountered missing dependencies: ## Setup: Encountered missing dependencies:
## base >=4.5 && <4.11 ## base >=4.5 && <4.11
@ -711,7 +702,7 @@ self: super: {
tasty-hedgehog = overrideCabal super.tasty-hedgehog (drv: { tasty-hedgehog = overrideCabal super.tasty-hedgehog (drv: {
## Setup: Encountered missing dependencies: ## Setup: Encountered missing dependencies:
## base >=4.8 && <4.11, tasty ==0.11.* ## base >=4.8 && <4.11
jailbreak = true; jailbreak = true;
}); });
@ -738,12 +729,6 @@ self: super: {
jailbreak = true; 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: { these = overrideCabal super.these (drv: {
## Setup: Encountered missing dependencies: ## Setup: Encountered missing dependencies:
## base >=4.5 && <4.11 ## base >=4.5 && <4.11