cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

haskellPackages: Fixup hspec-discover minor version in overrides

Browse source
This commit is contained in:
Robert Hensing 2023-11-10 18:40:12 +01:00
parent 743a7a597f
commit 4e2c97aa2b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,14 +58,14 @@ self: super: {
# allowInconsistentDependencies for all reverse dependencies of hspec-core, # allowInconsistentDependencies for all reverse dependencies of hspec-core,
# just upgrade to an hspec version without the offending dependency. # just upgrade to an hspec version without the offending dependency.
hspec-core = cself.hspec-core_2_11_7; hspec-core = cself.hspec-core_2_11_7;
hspec-discover = cself.hspec-discover_2_11_6; hspec-discover = cself.hspec-discover_2_11_7;
hspec = cself.hspec_2_11_6; hspec = cself.hspec_2_11_6;
# hspec-discover and hspec-core depend on hspec-meta for testing which # 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_11* # we need to avoid since it depends on ghc as well. Since hspec*_2_11*
# are overridden to take the versioned attributes as inputs, we need # are overridden to take the versioned attributes as inputs, we need
# to make sure to override the versioned attribute with this fix. # to make sure to override the versioned attribute with this fix.
hspec-discover_2_11_6 = dontCheck csuper.hspec-discover_2_11_6; hspec-discover_2_11_7 = dontCheck csuper.hspec-discover_2_11_7;
# Prevent dependency on doctest which causes an inconsistent dependency # Prevent dependency on doctest which causes an inconsistent dependency
# due to depending on ghc which depends on directory etc. # due to depending on ghc which depends on directory etc.
@ -1672,13 +1672,13 @@ self: super: {
# Give latest hspec correct dependency versions without overrideScope # Give latest hspec correct dependency versions without overrideScope
hspec_2_11_6 = doDistribute (super.hspec_2_11_6.override { hspec_2_11_6 = doDistribute (super.hspec_2_11_6.override {
hspec-discover = self.hspec-discover_2_11_6; hspec-discover = self.hspec-discover_2_11_7;
hspec-core = self.hspec-core_2_11_7; hspec-core = self.hspec-core_2_11_7;
}); });
hspec-meta_2_11_6 = doDistribute (super.hspec-meta_2_11_6.override { hspec-meta_2_11_6 = doDistribute (super.hspec-meta_2_11_6.override {
hspec-expectations = self.hspec-expectations_0_8_4; hspec-expectations = self.hspec-expectations_0_8_4;
}); });
hspec-discover_2_11_6 = doDistribute (super.hspec-discover_2_11_6.override { hspec-discover_2_11_7 = doDistribute (super.hspec-discover_2_11_7.override {
hspec-meta = self.hspec-meta_2_11_6; hspec-meta = self.hspec-meta_2_11_6;
}); });
# Need to disable tests to prevent an infinite recursion if hspec-core_2_11_7 # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_7