haskell-modules: update configuration-common.nix

This commit is contained in:
Yorick van Pelt 2019-09-02 15:19:40 +02:00 committed by Peter Simons
parent 67588cdd4b
commit 5791d8e600
2 changed files with 7 additions and 80 deletions

View File

@ -985,25 +985,17 @@ self: super: {
'';
});
# https://github.com/haskell-rewriting/term-rewriting/issues/11
term-rewriting = dontCheck (doJailbreak super.term-rewriting);
# https://github.com/haskell-rewriting/term-rewriting/pull/15
# remove on next hackage update
term-rewriting = doJailbreak super.term-rewriting;
# https://github.com/nick8325/twee/pull/1
twee-lib = dontHaddock super.twee-lib;
# Needs older hlint
hpio = dontCheck super.hpio;
# https://github.com/fpco/inline-c/issues/72
inline-c = dontCheck super.inline-c;
# https://github.com/GaloisInc/pure-zlib/issues/6
# https://github.com/GaloisInc/pure-zlib/pull/11
pure-zlib = doJailbreak super.pure-zlib;
# https://github.com/strake/lenz-template.hs/issues/1
# https://github.com/strake/lenz-template.hs/pull/2
lenz-template = doJailbreak super.lenz-template;
# https://github.com/haskell-hvr/resolv/issues/1
# https://github.com/haskell-hvr/resolv/pull/6
resolv = dontCheck super.resolv;
resolv_0_1_1_2 = dontCheck super.resolv_0_1_1_2;
@ -1016,11 +1008,6 @@ self: super: {
testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which];
preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"'';
});
arbtt = overrideCabal super.arbtt (drv: {
preCheck = ''
for n in $PWD/dist/build/*; do PATH+=":$n"; done
'';
});
# This package refers to the wrong library (itself in fact!)
vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; };
@ -1031,14 +1018,11 @@ self: super: {
# };
# https://github.com/dmwit/encoding/pull/3
encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch;
encoding = doJailbreak (appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch);
# Work around overspecified constraint on github ==0.18.
github-backup = doJailbreak super.github-backup;
# https://github.com/fpco/streaming-commons/issues/49
streaming-commons = dontCheck super.streaming-commons;
# Test suite depends on old QuickCheck 2.10.x.
cassava = dontCheck super.cassava;
@ -1069,16 +1053,9 @@ self: super: {
super.dhall-nix
);
# https://github.com/well-typed/cborg/issues/174
cborg = doJailbreak super.cborg;
serialise = doJailbreak (dontCheck super.serialise);
# https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558
netrc = doJailbreak super.netrc;
# https://github.com/phadej/tree-diff/issues/19
tree-diff = doJailbreak super.tree-diff;
# https://github.com/haskell-hvr/hgettext/issues/14
hgettext = doJailbreak super.hgettext;
@ -1089,23 +1066,6 @@ self: super: {
haddock-library = doJailbreak (dontCheck super.haddock-library);
# haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
# haskell-names-0.9.4: Break out of “tasty >=0.12 && <1.2”
haskell-names = doJailbreak super.haskell-names;
# hdocs-0.5.3.1: Break out of “haddock-api ==2.21.*”
# cannot use doJailbreak due to https://github.com/peti/jailbreak-cabal/issues/7
hdocs = overrideCabal super.hdocs (drv: {
postPatch = ''
sed -i 's#haddock-api == 2\.21\.\*,#haddock-api == 2.22.*,#' hdocs.cabal
'';
});
# Break out of tasty >=0.10 && <1.2.
aeson-compat = doJailbreak super.aeson-compat;
# Break out of pretty-show >=1.6 && <1.9
hedgehog = doJailbreak super.hedgehog;
# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: {
@ -1146,22 +1106,6 @@ self: super: {
# Generate shell completions
purescript = generateOptparseApplicativeCompletion "purs" super.purescript;
# https://github.com/adinapoli/mandrill/pull/52
mandrill = appendPatch super.mandrill (pkgs.fetchpatch {
url = https://github.com/adinapoli/mandrill/commit/30356d9dfc025a5f35a156b17685241fc3882c55.patch;
sha256 = "1qair09xs6vln3vsjz7sy4hhv037146zak4mq3iv6kdhmp606hqv";
});
# https://github.com/Euterpea/Euterpea2/pull/22
Euterpea = overrideSrc super.Euterpea {
src = pkgs.fetchFromGitHub {
owner = "Euterpea";
repo = "Euterpea2";
rev = "6f49b790adfb8b65d95a758116c20098fb0cd34c";
sha256 = "0qz1svb96n42nmig16vyphwxas34hypgayvwc91ri7w7xd6yi1ba";
};
};
# https://github.com/kcsongor/generic-lens/pull/65
generic-lens = dontCheck super.generic-lens;
@ -1186,7 +1130,6 @@ self: super: {
# Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30
tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1
these = doJailbreak super.these; # until these >= 0.7.6
uri-bytestring = appendPatch super.uri-bytestring (pkgs.fetchpatch {
url = "https://github.com/Soostone/uri-bytestring/commit/e5c5602a97160a6a6304a24947e33e47c9155460.patch";
@ -1198,13 +1141,6 @@ self: super: {
testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql];
});
# https://github.com/sighingnow/computations/pull/1
primesieve = appendPatch super.primesieve (pkgs.fetchpatch {
url = "https://github.com/sighingnow/computations/commit/1f96788367c879b999afe733e2fe28d919d17702.patch";
sha256 = "0lrcmcrxp9imj9rfaq7mb0fn9mxms4gq4sz95n4san3dpd0qmj9x";
stripLen = 1;
});
# Fix for base >= 4.11
scat = overrideCabal super.scat (drv: {
patches = [(pkgs.fetchpatch {
@ -1239,9 +1175,6 @@ self: super: {
# Fix build with attr-2.4.48 (see #53716)
xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch;
# Break out of pandoc >=2.0 && <2.7 (https://github.com/pbrisbin/yesod-markdown/pull/65)
yesod-markdown = doJailbreak super.yesod-markdown;
# 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; });
@ -1270,9 +1203,6 @@ self: super: {
# https://github.com/pruvisto/heap/issues/11
heap = dontCheck super.heap;
# https://github.com/hslua/tasty-lua/issues/1
tasty-lua = dontCheck super.tasty-lua;
# Test suite won't link for no apparent reason.
constraints-deriving = dontCheck super.constraints-deriving;

View File

@ -4547,7 +4547,6 @@ broken-packages:
- Empty
- empty-monad
- enchant
- encoding
- encoding-io
- engine-io-growler
- engine-io-snap
@ -4619,7 +4618,6 @@ broken-packages:
- euler-tour-tree
- euphoria
- eurofxref
- Euterpea
- eve
- eve-cli
- event
@ -10204,7 +10202,6 @@ broken-packages:
- xkcd
- xleb
- xlsior
- xlsx
- xlsx-tabular
- xlsx-templater
- xml-catalog