BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

haskellPackages: drop obsolete overrides that break evaluation

Browse source
This commit is contained in:
Peter Simons 2020-02-21 11:58:27 +01:00
parent 5bcd07a07d
commit 93b4f52f2c
2 changed files with 1 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -394,11 +394,6 @@ self: super: {
Random123 = dontCheck super.Random123;
systemd = dontCheck super.systemd;
# use the correct version of network
systemd_2_2_0 = dontCheck (super.systemd_2_2_0.override {
network = self.network_3_1_1_1;
});
# https://github.com/eli-frey/cmdtheline/issues/28
cmdtheline = dontCheck super.cmdtheline;
@ -1042,31 +1037,7 @@ self: super: {
vector-algorithms = dontCheck super.vector-algorithms;
# The test suite attempts to use the network.
dhall =
generateOptparseApplicativeCompletion "dhall" (
dontCheck super.dhall
);
# https://github.com/dhall-lang/dhall-haskell/commit/dedd5e0ea6fd12f87d887af3d2220eebc61ee8af
# This raises the lower bound on prettyprinter to 1.5.1 since
# `removeTrailingWhitespace` is buggy in earlier versions.
# This will probably be able to be removed when we update to LTS-15.
dhall_1_29_0 =
dontCheck (super.dhall_1_29_0.override {
prettyprinter = self.prettyprinter_1_6_1;
prettyprinter-ansi-terminal =
self.prettyprinter-ansi-terminal.override {
prettyprinter = self.prettyprinter_1_6_1;
};
});
dhall-bash_1_0_27 = super.dhall-bash_1_0_27.override { dhall = self.dhall_1_29_0; };
dhall-json_1_6_1 = super.dhall-json_1_6_1.override {
dhall = self.dhall_1_29_0;
prettyprinter = self.prettyprinter_1_6_1;
prettyprinter-ansi-terminal =
self.prettyprinter-ansi-terminal.override {
prettyprinter = self.prettyprinter_1_6_1;
};
};
dhall = generateOptparseApplicativeCompletion "dhall" (dontCheck super.dhall);
# Missing test files in source distribution, fixed once 1.4.0 is bumped
# https://github.com/dhall-lang/dhall-haskell/pull/997
@ -1093,7 +1064,6 @@ self: super: {
# The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5".
haddock-library = doJailbreak (dontCheck super.haddock-library);
haddock-library_1_8_0 = doJailbreak super.haddock-library_1_8_0;
# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
@ -1202,12 +1172,6 @@ self: super: {
# Fix build with attr-2.4.48 (see #53716)
xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch;
# These packages needs network 3.x, which is not in LTS-13.x.
network-bsd_2_8_1_0 = super.network-bsd_2_8_1_0.override { network = self.network_3_0_1_1; };
lambdabot-core = super.lambdabot-core.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; });
lambdabot-reference-plugins = super.lambdabot-reference-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; });
lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; });
# Some tests depend on a postgresql instance
# Haddock failure: https://github.com/haskell/haddock/issues/979
esqueleto = dontHaddock (dontCheck super.esqueleto);
@ -1232,12 +1196,6 @@ self: super: {
# Test suite won't link for no apparent reason.
constraints-deriving = dontCheck super.constraints-deriving;
# Use a matching version of ghc-lib-parser.
ghc-lib-parser-ex = super.ghc-lib-parser-ex.override { ghc-lib-parser = self.ghc-lib-parser_8_8_2_20200205; };
# https://github.com/sol/hpack/issues/366
hpack = self.hpack_0_33_0;
# QuickCheck >=2.3 && <2.13, hspec >=2.1 && <2.7
graphviz = dontCheck super.graphviz;
@ -1253,16 +1211,6 @@ self: super: {
'';
});
# The LTS-14.x version of their dependencies are too old.
cabal-plan = super.cabal-plan.overrideScope (self: super: {
optparse-applicative = self.optparse-applicative_0_15_1_0;
ansi-terminal = self.ansi-terminal_0_10_3;
base-compat = self.base-compat_0_11_1;
semialign = self.semialign_1_1;
time-compat = doJailbreak super.time-compat;
});
hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_23_0; };
# Version bounds for http-client are too strict:
# https://github.com/bitnomial/prometheus/issues/34
prometheus = doJailbreak super.prometheus;
@ -1299,10 +1247,6 @@ self: super: {
# upstream issue: https://github.com/vmchale/atspkg/issues/12
language-ats = dontCheck super.language-ats;
# polysemy-plugin requires polysemy >= 1.2.0.0
polysemy = self.polysemy_1_2_3_0;
polysemy-zoo = self.polysemy-zoo_0_6_0_1;
# https://github.com/Happstack/web-routes-th/pull/3
web-routes-th = doJailbreak super.web-routes-th;
@ -1336,18 +1280,6 @@ self: super: {
# needs newer version of the systemd package
spacecookie = super.spacecookie.override { systemd = self.systemd_2_2_0; };
# 2019-12-19 - glirc wants regex-tdfa >=1.3 which results in errors with regex-base which errors more
# hoping to make a proper derivation with plugins enabled and more reliable building -- kiwi
# 2020-01-17 - as of recently the basic doJailbreak is not enough and have to override regex-tdfa which needs an override for regex-base
glirc = doJailbreak (super.glirc.override {
regex-tdfa = self.regex-tdfa_1_3_1_0;
});
regex-tdfa_1_3_1_0 = doJailbreak (super.regex-tdfa_1_3_1_0.override {
regex-base = self.regex-base_0_94_0_0;
});
# 2020-01-19 - there were conflicting versions of brick, vty, and brick-skylighting;
# multiple versions of them were being pulled in by the others which is not allowed.
# There are more complicated ways of doing this but I was able to make it fairly simple -- kiwi
@ -1389,9 +1321,6 @@ self: super: {
# krank-0.1.0 does not accept PyF-0.9.0.0.
krank = doJailbreak super.krank;
# prettyprinter-1.6.0 fails its doctest suite.
prettyprinter_1_6_1 = dontCheck super.prettyprinter_1_6_1;
# the test suite has an overly tight restriction on doctest
# See https://github.com/ekmett/perhaps/pull/5
perhaps = doJailbreak super.perhaps;

58
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View file

@ -68,50 +68,7 @@ self: super: {
io-streams-haproxy = doJailbreak super.io-streams-haproxy; # base >=4.5 && <4.13
snap-server = doJailbreak super.snap-server;
xmobar = doJailbreak super.xmobar;
# use latest version to fix the build
brick = self.brick_0_52;
dbus = self.dbus_1_2_11;
doctemplates = self.doctemplates_0_8;
exact-pi = doJailbreak super.exact-pi;
generics-sop = self.generics-sop_0_5_0_0;
hackage-db = self.hackage-db_2_1_0;
haddock-library = self.haddock-library_1_8_0;
haskell-src-meta = self.haskell-src-meta_0_8_5;
haskell-src-meta_0_8_5 = dontCheck super.haskell-src-meta_0_8_5;
HaTeX = self.HaTeX_3_22_0_0;
HsYAML = self.HsYAML_0_2_1_0;
json-autotype = doJailbreak super.json-autotype;
lens = self.lens_4_19_1;
memory = self.memory_0_15_0;
microlens = self.microlens_0_4_11_2;
microlens-ghc = self.microlens-ghc_0_4_12;
microlens-mtl = self.microlens-mtl_0_2_0_1;
microlens-platform = self.microlens-platform_0_4_1;
microlens-th = self.microlens-th_0_4_3_4;
network = self.network_3_1_1_1;
optparse-applicative = self.optparse-applicative_0_15_1_0;
pandoc = dontCheck super.pandoc_2_9_1_1; # https://github.com/jgm/pandoc/issues/6086
pandoc-types = self.pandoc-types_1_20;
prettyprinter = self.prettyprinter_1_6_1;
primitive = dontCheck super.primitive_0_7_0_0; # evaluating the test suite gives an infinite recursion
regex-base = self.regex-base_0_94_0_0;
regex-compat = self.regex-compat_0_95_2_0;
regex-pcre-builtin = self.regex-pcre-builtin_0_95_1_1_8_43;
regex-posix = self.regex-posix_0_96_0_0;
regex-tdfa = self.regex-tdfa_1_3_1_0;
shelly = self.shelly_1_9_0;
singletons = self.singletons_2_6;
skylighting = self.skylighting_0_8_3_2;
skylighting-core = self.skylighting-core_0_8_3_2;
sop-core = self.sop-core_0_5_0_0;
texmath = self.texmath_0_12;
th-desugar = self.th-desugar_1_10;
tls = self.tls_1_5_4;
trifecta = self.trifecta_2_1;
vty = self.vty_5_26;
xml-conduit = overrideCabal super.xml-conduit (drv: { version = "1.9.0.0"; sha256 = "1p57v127882rxvvmwjmvnqdmk3x2wg1z4d8y03849h0xaz1vid0w"; });
xmonad-contrib = self.xmonad-contrib_0_16;
# These packages don't work and need patching and/or an update.
hackage-security = appendPatch (doJailbreak super.hackage-security) (pkgs.fetchpatch {
@ -138,19 +95,4 @@ self: super: {
# Upstream ships a broken Setup.hs file.
csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; });
# mark broken packages
bencode = markBrokenVersion "0.6.0.0" super.bencode;
easytest = markBroken super.easytest;
easytest_0_3 = markBroken super.easytest_0_3;
haskell-src = markBrokenVersion "1.0.3.0" super.haskell-src;
# The LTS-14.x version of the dependencies are too old.
policeman = super.policeman.overrideScope (self: super: {
ansi-terminal = self.ansi-terminal_0_10_3;
relude = self.relude_0_6_0_0;
});
# https://github.com/kowainik/relude/issues/241
relude_0_6_0_0 = dontCheck super.relude_0_6_0_0;
}