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

haskellPackages: Eval fixes

Browse source
This commit is contained in:
maralorn 2023-10-22 12:37:39 +02:00
parent b779210e3a
commit a1e8ef46c6
No known key found for this signature in database
2 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,15 +57,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_11_5;
hspec-discover = cself.hspec-discover_2_11_5;
hspec = cself.hspec_2_11_5;
hspec-core = cself.hspec-core_2_11_6;
hspec-discover = cself.hspec-discover_2_11_6;
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_5 = dontCheck csuper.hspec-discover_2_11_5;
hspec-discover_2_11_6 = dontCheck csuper.hspec-discover_2_11_6;
# Prevent dependency on doctest which causes an inconsistent dependency
# due to depending on ghc which depends on directory etc.
@ -194,11 +194,6 @@ self: super: {
})
] super.aeson);
# aeson 2.2.0.0 requires th-abstraction >= 0.5 & < 0.6
aeson_2_2_0_0 = super.aeson_2_2_0_0.overrideScope (hfinal: hprev: {
th-abstraction = hfinal.th-abstraction_0_5_0_0;
});
# 2023-06-28: Test error: https://hydra.nixos.org/build/225565149
orbits = dontCheck super.orbits;
@ -208,7 +203,7 @@ self: super: {
# 2023-08-09: Jailbreak because of vector < 0.13
monad-bayes = doJailbreak (super.monad-bayes.override {
hspec = self.hspec_2_11_5;
hspec = self.hspec_2_11_6;
});
# Disable tests failing on odd floating point numbers generated by QuickCheck 2.14.3
@ -1679,19 +1674,19 @@ self: super: {
servant-openapi3 = dontCheck super.servant-openapi3;
# Give latest hspec correct dependency versions without overrideScope
hspec_2_11_5 = doDistribute (super.hspec_2_11_5.override {
hspec-discover = self.hspec-discover_2_11_5;
hspec-core = self.hspec-core_2_11_5;
hspec_2_11_6 = doDistribute (super.hspec_2_11_6.override {
hspec-discover = self.hspec-discover_2_11_6;
hspec-core = self.hspec-core_2_11_6;
});
hspec-meta_2_11_5 = doDistribute (super.hspec-meta_2_11_5.override {
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_5 = doDistribute (super.hspec-discover_2_11_5.override {
hspec-meta = self.hspec-meta_2_11_5;
hspec-discover_2_11_6 = doDistribute (super.hspec-discover_2_11_6.override {
hspec-meta = self.hspec-meta_2_11_6;
});
# Need to disable tests to prevent an infinite recursion if hspec-core_2_11_5
# Need to disable tests to prevent an infinite recursion if hspec-core_2_11_6
# is overlayed to hspec-core.
hspec-core_2_11_5 = doDistribute (dontCheck (super.hspec-core_2_11_5.override {
hspec-core_2_11_6 = doDistribute (dontCheck (super.hspec-core_2_11_6.override {
hspec-expectations = self.hspec-expectations_0_8_4;
}));

2
pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
View file

@ -72,7 +72,7 @@ self: super: {
th-desugar = doDistribute self.th-desugar_1_15;
semigroupoids = doDistribute self.semigroupoids_6_0_0_1;
bifunctors = doDistribute self.bifunctors_5_6_1;
base-compat = doDistribute self.base-compat_0_13_0;
base-compat = doDistribute self.base-compat_0_13_1;
base-compat-batteries = doDistribute self.base-compat-batteries_0_13_0;
fgl = doDistribute self.fgl_5_8_1_1;