haskellPackages: Fix eval errors
This commit is contained in:
parent
735480cd0c
commit
1bb1559d75
|
@ -734,9 +734,9 @@ self: super: {
|
|||
testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ];
|
||||
testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];
|
||||
}) (super.sensei.override {
|
||||
hspec = self.hspec_2_10_6;
|
||||
hspec = self.hspec_2_10_7;
|
||||
hspec-wai = super.hspec-wai.override {
|
||||
hspec = self.hspec_2_10_6;
|
||||
hspec = self.hspec_2_10_7;
|
||||
};
|
||||
});
|
||||
|
||||
|
@ -1438,14 +1438,14 @@ self: super: {
|
|||
servant-openapi3 = dontCheck super.servant-openapi3;
|
||||
|
||||
# Give hspec 2.10.* correct dependency versions without overrideScope
|
||||
hspec_2_10_6 = doDistribute (super.hspec_2_10_6.override {
|
||||
hspec-discover = self.hspec-discover_2_10_6;
|
||||
hspec-core = self.hspec-core_2_10_6;
|
||||
hspec_2_10_7 = doDistribute (super.hspec_2_10_7.override {
|
||||
hspec-discover = self.hspec-discover_2_10_7;
|
||||
hspec-core = self.hspec-core_2_10_7;
|
||||
});
|
||||
hspec-discover_2_10_6 = super.hspec-discover_2_10_6.override {
|
||||
hspec-discover_2_10_7 = super.hspec-discover_2_10_7.override {
|
||||
hspec-meta = self.hspec-meta_2_10_5;
|
||||
};
|
||||
hspec-core_2_10_6 = super.hspec-core_2_10_6.override {
|
||||
hspec-core_2_10_7 = super.hspec-core_2_10_7.override {
|
||||
hspec-meta = self.hspec-meta_2_10_5;
|
||||
};
|
||||
|
||||
|
|
|
@ -126,7 +126,7 @@ self: super: {
|
|||
liquidhaskell = markBroken super.liquidhaskell;
|
||||
|
||||
# This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore.
|
||||
exceptions = super.exceptions_0_10_6;
|
||||
exceptions = super.exceptions_0_10_7;
|
||||
|
||||
# ghc versions which don‘t match the ghc-lib-parser-ex version need the
|
||||
# additional dependency to compile successfully.
|
||||
|
|
|
@ -112,10 +112,10 @@ in {
|
|||
# Note: Any compilation fixes need to be done on the versioned attributes,
|
||||
# since those are used for the internal dependencies between the versioned
|
||||
# hspec packages in configuration-common.nix.
|
||||
hspec = self.hspec_2_10_6;
|
||||
hspec-core = self.hspec-core_2_10_6;
|
||||
hspec = self.hspec_2_10_7;
|
||||
hspec-core = self.hspec-core_2_10_7;
|
||||
hspec-meta = self.hspec-meta_2_10_5;
|
||||
hspec-discover = self.hspec-discover_2_10_6;
|
||||
hspec-discover = self.hspec-discover_2_10_7;
|
||||
|
||||
# the dontHaddock is due to a GHC panic. might be this bug, not sure.
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/21619
|
||||
|
|
Loading…
Reference in a new issue