diff options
author | Robert Hensing <robert@roberthensing.nl> | 2023-11-10 18:40:12 +0100 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2023-11-10 18:40:12 +0100 |
commit | 4e2c97aa2b9ce8600e5b5f713da07562c804174d (patch) | |
tree | 79a022f2443c7a5dce6abe03046bb94931775e30 /pkgs/development/haskell-modules/configuration-common.nix | |
parent | 743a7a597fa7d275f44e1f40420ca3d43df80de1 (diff) |
haskellPackages: Fixup hspec-discover minor version in overrides
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 651d260a4947c..b80bf197151cd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -58,14 +58,14 @@ self: super: { # allowInconsistentDependencies for all reverse dependencies of hspec-core, # just upgrade to an hspec version without the offending dependency. 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-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* # 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_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 # due to depending on ghc which depends on directory etc. @@ -1672,13 +1672,13 @@ self: super: { # Give latest hspec correct dependency versions without overrideScope 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-meta_2_11_6 = doDistribute (super.hspec-meta_2_11_6.override { 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; }); # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_7 |