b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

haskellPackages.hspec*: Update overrides

Browse source
This commit is contained in:
maralorn 2023-04-22 22:56:04 +02:00
parent 799630369a
commit 59f654146c
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -61,15 +61,15 @@ self: super: {
# not solvable short of recompiling GHC. Instead of adding
# allowInconsistentDependencies for all reverse dependencies of hspec-core,
# just upgrade to an hspec version without the offending dependency.
hspec-core = cself.hspec-core_2_10_10;
hspec-discover = cself.hspec-discover_2_10_10;
hspec = cself.hspec_2_10_10;
hspec-core = cself.hspec-core_2_11_0;
hspec-discover = cself.hspec-discover_2_11_0;
hspec = cself.hspec_2_11_0;
# hspec-discover and hspec-core depend on hspec-meta for testing which
# we need to avoid since it depends on ghc as well. Since hspec*_2_10*
# are overridden to take the versioned attributes as inputs, we need
# to make sure to override the versioned attribute with this fix.
hspec-discover_2_10_10 = dontCheck csuper.hspec-discover_2_10_10;
hspec-discover_2_11_0 = dontCheck csuper.hspec-discover_2_11_0;
# Prevent dependency on doctest which causes an inconsistent dependency
# due to depending on ghc which depends on directory etc.
@ -1005,12 +1005,12 @@ 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_10;
hspec = self.hspec_2_11_0;
hspec-wai = self.hspec-wai.override {
hspec = self.hspec_2_10_10;
hspec = self.hspec_2_11_0;
};
hspec-contrib = self.hspec-contrib.override {
hspec-core = self.hspec-core_2_10_10;
hspec-core = self.hspec-core_2_11_0;
};
fsnotify = self.fsnotify_0_4_1_0;
});
@ -1674,16 +1674,16 @@ self: super: {
servant-openapi3 = dontCheck super.servant-openapi3;
# Give hspec 2.10.* correct dependency versions without overrideScope
hspec_2_10_10 = doDistribute (super.hspec_2_10_10.override {
hspec-discover = self.hspec-discover_2_10_10;
hspec-core = self.hspec-core_2_10_10;
hspec_2_11_0 = doDistribute (super.hspec_2_11_0.override {
hspec-discover = self.hspec-discover_2_11_0;
hspec-core = self.hspec-core_2_11_0;
});
hspec-discover_2_10_10 = doDistribute (super.hspec-discover_2_10_10.override {
hspec-discover_2_11_0 = doDistribute (super.hspec-discover_2_11_0.override {
hspec-meta = self.hspec-meta_2_10_5;
});
# Need to disable tests to prevent an infinite recursion if hspec-core_2_10_10
# Need to disable tests to prevent an infinite recursion if hspec-core_2_11_0
# is overlayed to hspec-core.
hspec-core_2_10_10 = doDistribute (dontCheck (super.hspec-core_2_10_10.override {
hspec-core_2_11_0 = doDistribute (dontCheck (super.hspec-core_2_11_0.override {
hspec-meta = self.hspec-meta_2_10_5;
}));

6
pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
View file

@ -110,10 +110,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_10;
hspec-core = self.hspec-core_2_10_10;
hspec = self.hspec_2_11_0;
hspec-core = self.hspec-core_2_11_0;
hspec-meta = self.hspec-meta_2_10_5;
hspec-discover = self.hspec-discover_2_10_10;
hspec-discover = self.hspec-discover_2_11_0;
# the dontHaddock is due to a GHC panic. might be this bug, not sure.
# https://gitlab.haskell.org/ghc/ghc/-/issues/21619