Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

haskell: remove obsolete overrides #91435

Closed
wants to merge 32 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
258be3b
haskell: remove obsolete overrides
svmhdvn Jun 24, 2020
6aa4013
more packages
svmhdvn Jun 24, 2020
9d18472
remove dontHaddock on esqueleto
svmhdvn Jun 24, 2020
49e51d6
remove dontCheck on rank2classes
svmhdvn Jun 24, 2020
20735de
remove dontCheck on HaTeX
svmhdvn Jun 24, 2020
eb4df21
remove dontHaddock on classy-prelude-yesod
svmhdvn Jun 24, 2020
7c4e61f
remove dontCheck on vector
svmhdvn Jun 24, 2020
d285305
remove dontCheck on euler
svmhdvn Jun 24, 2020
08ba437
remove dontHaddock on snappy-framing
svmhdvn Jun 25, 2020
5633999
remove dontCheck on stm-conduit
svmhdvn Jun 25, 2020
a818241
remove dontCheck on asn1-encoding
svmhdvn Jun 25, 2020
d376469
remove dontCheck on geodetics
svmhdvn Jun 25, 2020
d082a83
remove obsolete overrides on aeson
svmhdvn Jun 25, 2020
579cef8
remove dontCheck on lzma
svmhdvn Jun 25, 2020
4f303b7
remove dontCheck on BNFC
svmhdvn Jun 25, 2020
b42e590
remove dontCheck on serversession
svmhdvn Jun 25, 2020
3beb0e2
remove dontCheck on mockery
svmhdvn Jun 25, 2020
633e5fa
remove dontCheck on lzma-conduit
svmhdvn Jun 25, 2020
a81328a
remove dontCheck on sets
svmhdvn Jun 25, 2020
9ed1387
remove dontCheck on singletons
svmhdvn Jun 25, 2020
e2fee16
remove dontCheck on math-functions
svmhdvn Jun 25, 2020
3ba773a
remove dontCheck on terminal-progress-bar
svmhdvn Jun 25, 2020
7c8fb80
remove doJailbreak on lifted-base
svmhdvn Jun 25, 2020
f4db042
remove override on lens
svmhdvn Jun 25, 2020
3280d21
remove override on fgl
svmhdvn Jun 25, 2020
b143041
remove override on http-api-data
svmhdvn Jun 25, 2020
e828f48
remove dontCheck on lucid
svmhdvn Jun 25, 2020
494833f
remove dontCheck on zeromq4-haskell
svmhdvn Jun 25, 2020
9d9bee5
remove dontHaddock on bytestring-progress
svmhdvn Jun 25, 2020
3bd817c
remove dontCheck on simple-sendfile
svmhdvn Jun 25, 2020
aaadfc4
remove dontCheck on getopt-generics
svmhdvn Jun 25, 2020
1322c51
remove dontCheck on Hclip
svmhdvn Jun 25, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 6 additions & 95 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@ self: super: {
mysql-simple = dontCheck super.mysql-simple;
mysql-haskell = dontCheck super.mysql-haskell;

# Tests failing, fixed once 0.8.0 is in stackage
# https://gitlab.com/twittner/zeromq-haskell/issues/63
zeromq4-haskell = dontCheck super.zeromq4-haskell;

# The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.
# https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
git-annex = (overrideSrc super.git-annex {
Expand Down Expand Up @@ -121,19 +117,16 @@ self: super: {
});

# The Haddock phase fails for one reason or another.
bytestring-progress = dontHaddock super.bytestring-progress;
deepseq-magic = dontHaddock super.deepseq-magic;
feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1
hoodle-core = dontHaddock super.hoodle-core;
hsc3-db = dontHaddock super.hsc3-db;
classy-prelude-yesod = dontHaddock super.classy-prelude-yesod; # https://github.com/haskell/haddock/issues/979

# https://github.com/techtangents/ablist/issues/1
ABList = dontCheck super.ABList;

# sse2 flag due to https://github.com/haskell/vector/issues/47.
# dontCheck due to https://github.com/haskell/vector/issues/138
vector = dontCheck (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector);
vector = if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector;

conduit-extra = if pkgs.stdenv.isDarwin
then super.conduit-extra.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; })
Expand Down Expand Up @@ -177,20 +170,14 @@ self: super: {
# Test suite depends on source code being available
simple-affine-space = dontCheck super.simple-affine-space;

# https://github.com/kazu-yamamoto/simple-sendfile/issues/17
simple-sendfile = dontCheck super.simple-sendfile;

# Fails no apparent reason. Upstream has been notified by e-mail.
assertions = dontCheck super.assertions;

# These packages try to execute non-existent external programs.
cmaes = dontCheck super.cmaes; # http://hydra.cryp.to/build/498725/log/raw
dbmigrations = dontCheck super.dbmigrations;
euler = dontCheck super.euler; # https://github.com/decomputed/euler/issues/1
filestore = dontCheck super.filestore;
getopt-generics = dontCheck super.getopt-generics;
graceful = dontCheck super.graceful;
Hclip = dontCheck super.Hclip;
HList = dontCheck super.HList;
ide-backend = dontCheck super.ide-backend;
marquise = dontCheck super.marquise; # https://github.com/anchor/marquise/issues/69
Expand Down Expand Up @@ -318,7 +305,6 @@ self: super: {
language-slice = dontCheck super.language-slice;
ldap-client = dontCheck super.ldap-client;
lensref = dontCheck super.lensref;
lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25
lvmrun = disableHardening (dontCheck super.lvmrun) ["format"];
matplotlib = dontCheck super.matplotlib;
memcache = dontCheck super.memcache;
Expand Down Expand Up @@ -391,9 +377,6 @@ self: super: {
# https://github.com/bos/snappy/issues/1
snappy = dontCheck super.snappy;

# https://github.com/kim/snappy-framing/issues/3
snappy-framing = dontHaddock super.snappy-framing;

# https://ghc.haskell.org/trac/ghc/ticket/9625
vty = dontCheck super.vty;

Expand All @@ -406,9 +389,6 @@ self: super: {
# https://github.com/joeyadams/haskell-stm-delay/issues/3
stm-delay = dontCheck super.stm-delay;

# https://github.com/cgaebel/stm-conduit/issues/33
stm-conduit = dontCheck super.stm-conduit;

# https://github.com/pixbi/duplo/issues/25
duplo = dontCheck super.duplo;

Expand All @@ -434,9 +414,6 @@ self: super: {
# https://github.com/NixOS/nixpkgs/issues/6350
paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; });

# https://github.com/vincenthz/hs-asn1/issues/12
asn1-encoding = dontCheck super.asn1-encoding;

# Avoid "QuickCheck >=2.3 && <2.10" dependency we cannot fulfill in lts-11.x.
test-framework = dontCheck super.test-framework;

Expand All @@ -454,13 +431,10 @@ self: super: {
apiary-session = dontCheck super.apiary-session;
apiary-websockets = dontCheck super.apiary-websockets;

# https://github.com/PaulJohnson/geodetics/issues/1
geodetics = dontCheck super.geodetics;

# https://github.com/junjihashimoto/test-sandbox-compose/issues/2
test-sandbox-compose = dontCheck super.test-sandbox-compose;

# https://github.com/tych0/xcffib/issues/37
# Waiting on language-python 0.5.8 https://github.com/bjpop/language-python/issues/60
xcffib = dontCheck super.xcffib;

# https://github.com/afcowie/locators/issues/1
Expand Down Expand Up @@ -501,13 +475,7 @@ self: super: {
then self.buildHaskellPackages.tasty-discover
else dontCheck super.tasty-discover);

# generic-deriving bound is too tight
# aeson 1.4.6.0 needs Diff 0.4.0 to do tests but nixpkgs is still at 0.3.4
# https://github.com/bos/aeson/issues/740
aeson = dontCheck (doJailbreak super.aeson);

# containers >=0.4 && <0.6 is too tight
# https://github.com/RaphaelJ/friday/issues/34
# Waiting on https://github.com/RaphaelJ/friday/pull/36
friday = doJailbreak super.friday;

# Won't compile with recent versions of QuickCheck.
Expand All @@ -528,12 +496,6 @@ self: super: {
# https://github.com/alphaHeavy/lzma-enumerator/issues/3
lzma-enumerator = dontCheck super.lzma-enumerator;

# https://github.com/haskell-hvr/lzma/issues/14
lzma = dontCheck super.lzma;

# https://github.com/BNFC/bnfc/issues/140
BNFC = dontCheck super.BNFC;

# FPCO's fork of Cabal won't succeed its test suite.
Cabal-ide-backend = dontCheck super.Cabal-ide-backend;

Expand All @@ -548,21 +510,12 @@ self: super: {
inline-c-win32 = dontDistribute super.inline-c-win32;
Southpaw = dontDistribute super.Southpaw;

# https://github.com/yesodweb/serversession/issues/1
serversession = dontCheck super.serversession;

# Hydra no longer allows building texlive packages.
lhs2tex = dontDistribute super.lhs2tex;

# https://ghc.haskell.org/trac/ghc/ticket/9825
vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; });

# https://github.com/hspec/mockery/issues/6
mockery = overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; });

# https://github.com/alphaHeavy/lzma-conduit/issues/5
lzma-conduit = dontCheck super.lzma-conduit;

# https://github.com/kazu-yamamoto/logger/issues/42
logger = dontCheck super.logger;

Expand Down Expand Up @@ -593,9 +546,6 @@ self: super: {
sha256 = "13g462qmj8c7if797gnyvf8h0cddmm3xy0pjldw48w8f8sr4qsj0";
});

# https://github.com/athanclark/sets/issues/2
sets = dontCheck super.sets;

# Install icons, metadata and cli program.
bustle = overrideCabal super.bustle (drv: {
buildDepends = [ pkgs.libpcap ];
Expand Down Expand Up @@ -679,9 +629,6 @@ self: super: {
# https://github.com/pxqr/base32-bytestring/issues/4
base32-bytestring = dontCheck super.base32-bytestring;

# https://github.com/goldfirere/singletons/issues/122
singletons = dontCheck super.singletons;

# Djinn's last release was 2014, incompatible with Semigroup-Monoid Proposal
# https://github.com/augustss/djinn/pull/8
djinn = appendPatch super.djinn (pkgs.fetchpatch {
Expand All @@ -706,9 +653,6 @@ self: super: {
# The standard libraries are compiled separately.
idris = generateOptparseApplicativeCompletion "idris" (dontCheck super.idris);

# https://github.com/bos/math-functions/issues/25
math-functions = dontCheck super.math-functions;

# build servant docs from the repository
servant =
let
Expand Down Expand Up @@ -746,10 +690,6 @@ self: super: {
# https://github.com/bmillwood/applicative-quoters/issues/6
applicative-quoters = doJailbreak super.applicative-quoters;

# https://github.com/roelvandijk/terminal-progress-bar/issues/13
# Still needed because of HUnit < 1.6
terminal-progress-bar = doJailbreak super.terminal-progress-bar;

# https://hydra.nixos.org/build/42769611/nixlog/1/raw
# note: the library is unmaintained, no upstream issue
dataenc = doJailbreak super.dataenc;
Expand All @@ -772,39 +712,24 @@ self: super: {
# No upstream issue tracker
hspec-expectations-pretty-diff = dontCheck super.hspec-expectations-pretty-diff;

# https://github.com/basvandijk/lifted-base/issues/34
# Still needed as HUnit < 1.5
lifted-base = doJailbreak super.lifted-base;

# Don't depend on chell-quickcheck, which doesn't compile due to restricting
# QuickCheck to versions ">=2.3 && <2.9".
system-filepath = dontCheck super.system-filepath;

# https://github.com/basvandijk/case-insensitive/issues/24
# Still needed as HUnit < 1.6
case-insensitive = doJailbreak super.case-insensitive;
#case-insensitive = doJailbreak super.case-insensitive;

# https://github.com/hvr/uuid/issues/28
uuid-types = doJailbreak super.uuid-types;
uuid = doJailbreak super.uuid;

# https://github.com/ekmett/lens/issues/713
lens = disableCabalFlag super.lens "test-doctests";

# https://github.com/haskell/fgl/issues/60
# Needed for QuickCheck < 2.10
fgl = dontCheck super.fgl;
fgl-arbitrary = doJailbreak super.fgl-arbitrary;

# The tests spuriously fail
libmpd = dontCheck super.libmpd;

# https://github.com/dan-t/cabal-lenses/issues/6
cabal-lenses = doJailbreak super.cabal-lenses;

# https://github.com/fizruk/http-api-data/issues/49
http-api-data = dontCheck super.http-api-data;

# https://github.com/diagrams/diagrams-lib/issues/288
diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; });

Expand Down Expand Up @@ -1063,10 +988,6 @@ self: super: {
sha256 = "056rk58v9h114mjx62f41x971xn9p3nhsazcf9zrcyxh1ymrdm8j";
});

# Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73
blank-canvas = dontCheck super.blank-canvas;
blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2;

# needed because of testing-feat >=0.4.0.2 && <1.1
language-ecmascript = doJailbreak super.language-ecmascript;

Expand Down Expand Up @@ -1108,7 +1029,7 @@ self: super: {
# https://github.com/danfran/cabal-macosx/issues/13
cabal-macosx = dontCheck super.cabal-macosx;

# https://github.com/DanielG/cabal-helper/issues/59
# https://github.com/DanielG/cabal-helper/pull/123
cabal-helper = doJailbreak super.cabal-helper;

# TODO(Profpatsch): factor out local nix store setup from
Expand All @@ -1128,9 +1049,6 @@ self: super: {
# https://github.com/mgajda/json-autotype/issues/25
json-autotype = dontCheck super.json-autotype;

# Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30
tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1

# Requires pg_ctl command during tests
beam-postgres = overrideCabal super.beam-postgres (drv: {
testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql];
Expand Down Expand Up @@ -1161,8 +1079,7 @@ self: super: {
xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch;

# Some tests depend on a postgresql instance
# Haddock failure: https://github.com/haskell/haddock/issues/979
esqueleto = dontHaddock (dontCheck super.esqueleto);
esqueleto = dontCheck super.esqueleto;

# Requires API keys to run tests
algolia = dontCheck super.algolia;
Expand Down Expand Up @@ -1212,9 +1129,6 @@ self: super: {
# https://github.com/erikd/hjsmin/issues/32
hjsmin = dontCheck super.hjsmin;

# https://github.com/blamario/grampa/issues/19
rank2classes = dontCheck super.rank2classes;

nix-tools = super.nix-tools.overrideScope (self: super: {
# Needs https://github.com/peti/hackage-db/pull/9
hackage-db = super.hackage-db.overrideAttrs (old: {
Expand Down Expand Up @@ -1251,9 +1165,6 @@ self: super: {
];
});

# https://github.com/Daniel-Diaz/HaTeX/issues/144
HaTeX = dontCheck super.HaTeX;

# https://github.com/kazu-yamamoto/dns/issues/150
dns = dontCheck super.dns;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2548,7 +2548,6 @@ extra-packages:
- apply-refact == 0.8.0.0 # works with GHC 8.10.x https://hackage.haskell.org/package/apply-refact/changelog
- binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers
- binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers
- blank-canvas < 0.6.3 # more recent versions depend on base-compat-batteries == 0.10.* but we're on base-compat-0.9.*
- Cabal == 2.2.* # required for jailbreak-cabal etc.
- Cabal == 2.4.* # required for cabal-install etc.
- colour < 2.3.4 # newer versions don't support GHC 7.10.x
Expand Down