Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
5ab7854
dhall-json: skip tests to skip tasty 1.4 dependency
cideM Jan 8, 2021
2a9c1eb
haskellPackages.nothunks: jailbreak to fix tests
expipiplus1 Jan 8, 2021
fcbb152
Merge pull request #108765 from cideM/haskell-updates
cdepillabout Jan 9, 2021
6e80b3b
Merge pull request #108788 from expipiplus1/joe-nothunks
cdepillabout Jan 9, 2021
cade44d
haskellPackages.derive-storable-plugin: remove from broken list
expipiplus1 Jan 9, 2021
cd4e067
Merge pull request #108828 from expipiplus1/joe-dsp
cdepillabout Jan 9, 2021
3947695
co-log, chronos: unmarkBroken
cideM Jan 8, 2021
0127170
Merge pull request #108780 from cideM/unbreak-co-log
cdepillabout Jan 9, 2021
8911c99
hackage-packages.nix: automatic Haskell package set update
peti Jan 10, 2021
59d349a
haskellPackages.threadscope: Remove jailbreak after package update
markus1189 Jan 10, 2021
38201ec
Merge pull request #108922 from markus1189/threadscope
cdepillabout Jan 10, 2021
c168f4d
hackage-packages.nix: automatic Haskell package set update
peti Jan 11, 2021
aaf9105
Stackage Nightly 2021-01-11
peti Jan 11, 2021
daa5042
hackage-packages.nix: automatic Haskell package set update
peti Jan 11, 2021
3aae691
Merge remote-tracking branch 'origin/master' into haskell-updates.
peti Jan 11, 2021
3fa0bf0
Break the following dependency cycles
Jan 12, 2021
0d4fdba
Merge pull request #109093 from poscat0x04/break-tasty-cycle
cdepillabout Jan 12, 2021
aea756e
dhall-json: unmark as broken
mcwitt Jan 13, 2021
48db582
dhall-lsp-server: unmark as broken
mcwitt Jan 13, 2021
af3814d
hackage-packages.nix: automatic Haskell package set update
peti Jan 13, 2021
8eb0bdc
Merge pull request #109126 from mcwitt/dhall-unmark-broken
cdepillabout Jan 13, 2021
497544f
haskellPackages.tasty-expected-failure: disable failing tests
mcwitt Jan 14, 2021
d594362
haskellPackages.dhall-yaml: unmark as broken
mcwitt Jan 14, 2021
bede7ee
haskellPackages.dhall-yaml: generate completions
mcwitt Jan 14, 2021
31fef6c
Stackage Nightly 2021-01-14
peti Jan 14, 2021
fa28fae
hackage-packages.nix: automatic Haskell package set update
peti Jan 14, 2021
8a3d308
Merge remote-tracking branch 'origin/master' into haskell-updates.
peti Jan 14, 2021
0947251
hackage-packages.nix: automatic Haskell package set update
peti Jan 15, 2021
c8e886e
haskellPackages.haskell-language-server: Fix build
maralorn Jan 15, 2021
8084a91
haskell-http-client: update overrides for the latest version
peti Jan 15, 2021
589ce02
hackage2nix: update list of broken packages to fix evaluation
peti Jan 15, 2021
915ef21
hackage-packages.nix: automatic Haskell package set update
peti Jan 15, 2021
a12136e
haskellPackages.reflex: Fix build
maralorn Jan 15, 2021
4827826
haskellPackages.servant: stop building documentation
cdepillabout Dec 29, 2020
6c3e331
haskell-lukko: jailbreak to fix the build with the latest version of …
peti Jan 15, 2021
5b220ae
haskell-http-client-restricted: jailbreak to fix the build with older…
peti Jan 15, 2021
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
66 changes: 32 additions & 34 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,10 @@ self: super: {
then self.buildHaskellPackages.tasty-discover
else dontCheck super.tasty-discover);

# Known issue with nondeterministic test suite failure
# https://github.com/nomeata/tasty-expected-failure/issues/21
tasty-expected-failure = dontCheck super.tasty-expected-failure;

# Waiting on https://github.com/RaphaelJ/friday/pull/36
friday = doJailbreak super.friday;

Expand Down Expand Up @@ -681,34 +685,6 @@ self: super: {
# The standard libraries are compiled separately.
idris = generateOptparseApplicativeCompletion "idris" (dontCheck super.idris);

# build servant docs from the repository
servant =
let
ver = super.servant.version;
docs = pkgs.stdenv.mkDerivation {
name = "servant-sphinx-documentation-${ver}";
src = "${pkgs.fetchFromGitHub {
owner = "haskell-servant";
repo = "servant";
rev = "v${ver}";
sha256 = "0xk3czk3jhqjxhy0g8r2248m8yxgvmqhgn955k92z0h7p02lfs89";
}}/doc";
# Needed after sphinx 1.7.9 -> 1.8.3
postPatch = ''
substituteInPlace conf.py --replace "'.md': CommonMarkParser," ""
'';
nativeBuildInputs = with pkgs.buildPackages.python3Packages; [ sphinx recommonmark sphinx_rtd_theme ];
makeFlags = [ "html" ];
installPhase = ''
mv _build/html $out
'';
};
in overrideCabal super.servant (old: {
postInstall = old.postInstall or "" + ''
ln -s ${docs} ''${!outputDoc}/share/doc/servant
'';
});

# https://github.com/pontarius/pontarius-xmpp/issues/105
pontarius-xmpp = dontCheck super.pontarius-xmpp;

Expand Down Expand Up @@ -954,6 +930,10 @@ self: super: {
# Work around overspecified constraint on github ==0.18.
github-backup = doJailbreak super.github-backup;

# https://github.com/andrewthad/chronos/issues/62
# doctests are failing on newer GHC versions
chronos = dontCheck super.chronos;

# Test suite depends on cabal-install
doctest = dontCheck super.doctest;

Expand All @@ -963,8 +943,12 @@ self: super: {

# Generate cli completions for dhall.
dhall = generateOptparseApplicativeCompletion "dhall" super.dhall;
dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] super.dhall-json;
# For reasons that are not quire clear 'dhall-json' won't compile without 'tasty 1.4' due to its tests
# https://github.com/commercialhaskell/stackage/issues/5795
# This issue can be mitigated with 'dontCheck' which skips the tests and their compilation.
dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (dontCheck super.dhall-json);
dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" super.dhall-nix;
dhall-yaml = generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml;

# https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558
netrc = doJailbreak super.netrc;
Expand Down Expand Up @@ -1434,8 +1418,9 @@ self: super: {
# 1. test requires internet
# 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
ghcide = doDistribute (unmarkBroken (dontCheck
(super.ghcide.override { lsp-test = dontCheck self.lsp-test_0_11_0_7; })
));
(super.ghcide_0_7_0_0.override {
lsp-test = dontCheck self.lsp-test_0_11_0_7;
})));
refinery = doDistribute super.refinery_0_3_0_0;
data-tree-print = doJailbreak super.data-tree-print;

Expand All @@ -1458,6 +1443,9 @@ self: super: {
# https://github.com/adnelson/semver-range/issues/15
semver-range = dontCheck super.semver-range;

# https://github.com/obsidiansystems/dependent-sum/issues/55
dependent-sum = doJailbreak super.dependent-sum;

dependent-sum-aeson-orphans = appendPatch super.dependent-sum-aeson-orphans (pkgs.fetchpatch {
# 2020-11-18: https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/9
# Bump version bounds for ghc 8.10
Expand All @@ -1473,7 +1461,7 @@ self: super: {
# base upper bound is incompatible with ghc 8.10
neuron = doJailbreak super.neuron;

reflex = appendPatches super.reflex [
reflex = dontCheck (doJailbreak (appendPatches super.reflex [
# https://github.com/reflex-frp/reflex/pull/444
# Fixes for ghc 8.10
(pkgs.fetchpatch {
Expand All @@ -1486,7 +1474,7 @@ self: super: {
url = https://patch-diff.githubusercontent.com/raw/reflex-frp/reflex/pull/448.patch;
sha256 = "0a8gcq9g8dyyafkvs54mi3fnisff20r0x0qzmhxcp9md61nkf7gq";
})
];
]));

# 2020-11-19: jailbreaking because of pretty-simple bound out of date
# https://github.com/kowainik/stan/issues/408
Expand Down Expand Up @@ -1534,7 +1522,7 @@ self: super: {

# 2020-12-05: http-client is fixed on too old version
essence-of-live-coding-warp = super.essence-of-live-coding-warp.override {
http-client = self.http-client_0_7_3;
http-client = self.http-client_0_7_4;
};

# 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27)
Expand Down Expand Up @@ -1572,4 +1560,14 @@ self: super: {
# https://github.com/jaspervdj/profiteur/issues/33
profiteur = doJailbreak super.profiteur;

# Test suite has overly strict bounds on tasty.
# https://github.com/input-output-hk/nothunks/issues/9
nothunks = doJailbreak super.nothunks;

# Allow building with recent versions of tasty.
lukko = doJailbreak super.lukko;

# Allow building with older versions of http-client.
http-client-restricted = doJailbreak super.http-client-restricted;

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
Loading