haskell.packages.ghc921: fix eval for Stackage Nightly 2022-02-17
We can drop a lot of version picks that have already made their way into Stackage Nightly.
This commit is contained in:
sternenseemann
parent
a56ab263df
commit
e95f451ea6
@ -75,7 +75,7 @@ self: super: {
|
||||
Cabal = self.Cabal_3_6_2_0;
|
||||
});
|
||||
|
||||
doctest = dontCheck (doJailbreak super.doctest_0_18_2);
|
||||
doctest = dontCheck (doJailbreak super.doctest);
|
||||
|
||||
# Tests fail in GHC 9.2
|
||||
extra = dontCheck super.extra;
|
||||
@ -88,12 +88,10 @@ self: super: {
|
||||
|
||||
assoc = doJailbreak super.assoc;
|
||||
async = doJailbreak super.async;
|
||||
attoparsec = super.attoparsec_0_14_4;
|
||||
base64-bytestring = doJailbreak super.base64-bytestring;
|
||||
base-compat = self.base-compat_0_12_1;
|
||||
base-compat-batteries = self.base-compat-batteries_0_12_1;
|
||||
binary-instances = doJailbreak super.binary-instances;
|
||||
binary-orphans = super.binary-orphans_1_0_2;
|
||||
ChasingBottoms = doJailbreak super.ChasingBottoms;
|
||||
constraints = doJailbreak super.constraints;
|
||||
cpphs = overrideCabal (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";}) super.cpphs;
|
||||
@ -102,9 +100,6 @@ self: super: {
|
||||
data-fix = doJailbreak super.data-fix;
|
||||
dec = doJailbreak super.dec;
|
||||
ed25519 = doJailbreak super.ed25519;
|
||||
genvalidity = self.genvalidity_1_0_0_1;
|
||||
genvalidity-property = self.genvalidity-property_1_0_0_0;
|
||||
genvalidity-hspec = self.genvalidity-hspec_1_0_0_0;
|
||||
ghc-byteorder = doJailbreak super.ghc-byteorder;
|
||||
ghc-exactprint = overrideCabal (drv: {
|
||||
# HACK: ghc-exactprint 1.4.1 is not buildable for GHC < 9.2,
|
||||
@ -125,7 +120,7 @@ self: super: {
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1;
|
||||
hackage-security = doJailbreak super.hackage-security;
|
||||
hashable = super.hashable_1_4_0_2;
|
||||
hashable-time = doJailbreak super.hashable-time_0_3;
|
||||
hashable-time = doJailbreak super.hashable-time;
|
||||
hedgehog = doJailbreak super.hedgehog;
|
||||
HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP);
|
||||
integer-logarithms = overrideCabal (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; }) (doJailbreak super.integer-logarithms);
|
||||
@ -133,18 +128,14 @@ self: super: {
|
||||
indexed-traversable-instances = doJailbreak super.indexed-traversable-instances;
|
||||
lifted-async = doJailbreak super.lifted-async;
|
||||
lukko = doJailbreak super.lukko;
|
||||
network = super.network_3_1_2_7;
|
||||
ormolu = self.ormolu_0_4_0_0;
|
||||
OneTuple = super.OneTuple_0_3_1;
|
||||
parallel = doJailbreak super.parallel;
|
||||
path = doJailbreak super.path_0_9_2;
|
||||
path = doJailbreak super.path;
|
||||
polyparse = overrideCabal (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }) (doJailbreak super.polyparse);
|
||||
primitive = doJailbreak super.primitive;
|
||||
quickcheck-instances = super.quickcheck-instances_0_3_27;
|
||||
regex-posix = doJailbreak super.regex-posix;
|
||||
resolv = doJailbreak super.resolv;
|
||||
retrie = doDistribute (dontCheck self.retrie_1_2_0_1);
|
||||
semialign = super.semialign_1_2_0_1;
|
||||
singleton-bool = doJailbreak super.singleton-bool;
|
||||
scientific = doJailbreak super.scientific;
|
||||
shelly = doJailbreak super.shelly;
|
||||
@ -155,7 +146,7 @@ self: super: {
|
||||
tasty-hspec = doJailbreak super.tasty-hspec;
|
||||
th-desugar = self.th-desugar_1_13;
|
||||
these = doJailbreak super.these;
|
||||
time-compat = doJailbreak super.time-compat_1_9_6_1;
|
||||
time-compat = doJailbreak super.time-compat;
|
||||
type-equality = doJailbreak super.type-equality;
|
||||
unordered-containers = doJailbreak super.unordered-containers;
|
||||
vector = doJailbreak (dontCheck super.vector);
|
||||
@ -172,7 +163,7 @@ self: super: {
|
||||
] ++ drv.testFlags or [];
|
||||
}) (doJailbreak super.hpack);
|
||||
|
||||
validity = pkgs.lib.pipe super.validity_0_12_0_0 [
|
||||
validity = pkgs.lib.pipe super.validity [
|
||||
# head.hackage patch
|
||||
(appendPatch (pkgs.fetchpatch {
|
||||
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/9110e6972b5daf085e19cad41f97920d3ddac499/patches/validity-0.12.0.0.patch";
|
||||
@ -197,10 +188,6 @@ self: super: {
|
||||
# Tests depend on `parseTime` which is no longer available
|
||||
hourglass = dontCheck super.hourglass;
|
||||
|
||||
# 1.2.1 introduced support for GHC 9.2.1, stackage has 1.2.0
|
||||
# The test suite indirectly depends on random, which leads to infinite recursion
|
||||
random = dontCheck super.random_1_2_1;
|
||||
|
||||
# 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0
|
||||
memory = appendPatch (pkgs.fetchpatch {
|
||||
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/memory-0.16.0.patch";
|
||||
@ -208,7 +195,7 @@ self: super: {
|
||||
}) (overrideCabal {
|
||||
editedCabalFile = null;
|
||||
revision = null;
|
||||
} super.memory_0_16_0);
|
||||
} super.memory);
|
||||
|
||||
# GHC 9.0.x doesn't like `import Spec (main)` in Main.hs
|
||||
# https://github.com/snoyberg/mono-traversable/issues/192
|
||||
@ -221,9 +208,6 @@ self: super: {
|
||||
# Upper bound on `hashable` is too restrictive
|
||||
semigroupoids = overrideCabal (drv: { postPatch = "sed -i -e 's,hashable >= 1.2.7.0 && < 1.4,hashable >= 1.2.7.0 \\&\\& < 1.5,' semigroupoids.cabal";}) super.semigroupoids;
|
||||
|
||||
# Tests have a circular dependency on quickcheck-instances
|
||||
text-short = dontCheck super.text-short_0_1_5;
|
||||
|
||||
# Use hlint from git for GHC 9.2.1 support
|
||||
hlint = doDistribute (
|
||||
overrideSrc {
|
||||
@ -234,10 +218,7 @@ self: super: {
|
||||
rev = "77a9702e10b772a7695c08682cd4f450fd0e9e46";
|
||||
sha256 = "0hpp3iw7m7w2abr8vb86gdz3x6c8lj119zxln933k90ia7bmk8jc";
|
||||
};
|
||||
} (super.hlint_3_3_6.overrideScope (self: super: {
|
||||
ghc-lib-parser = self.ghc-lib-parser_9_2_1_20220109;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1;
|
||||
}))
|
||||
} super.hlint
|
||||
);
|
||||
|
||||
# https://github.com/sjakobi/bsb-http-chunked/issues/38
|
||||
@ -251,7 +232,6 @@ self: super: {
|
||||
implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
|
||||
lucid = doJailbreak super.lucid;
|
||||
hashtables = doJailbreak super.hashtables;
|
||||
primitive-extras = super.primitive-extras_0_10_1_4;
|
||||
hiedb = doJailbreak super.hiedb;
|
||||
|
||||
# 2022-02-05: The following plugins don‘t work yet on ghc9.2.
|
||||
@ -264,9 +244,6 @@ self: super: {
|
||||
"-f-hlint"
|
||||
"-f-retrie"
|
||||
"-f-splice"
|
||||
"-f-tactics"
|
||||
"-f-brittany"
|
||||
"-f-stylish-haskell"
|
||||
] (super.haskell-language-server.override {
|
||||
hls-alternate-number-format-plugin = null;
|
||||
hls-class-plugin = null;
|
||||
@ -275,8 +252,5 @@ self: super: {
|
||||
hls-hlint-plugin = null;
|
||||
hls-retrie-plugin = null;
|
||||
hls-splice-plugin = null;
|
||||
hls-tactics-plugin = null;
|
||||
hls-brittany-plugin = null;
|
||||
hls-stylish-haskell-plugin = null;
|
||||
});
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user