spago: 0.12.1.0 -> 0.13.0

This commit is contained in:
(cdep)illabout
2019-12-20 16:12:29 +09:00
committed by Peter Simons
parent 54fad88234
commit b7a5df05c3
6 changed files with 65 additions and 55 deletions

View File

@@ -644,8 +644,8 @@ self: super: builtins.intersectAttrs super {
# we can safely jailbreak spago and use the older directory package from
# LTS-14.
spagoWithOverrides = doJailbreak (super.spago.override {
# spago requires the latest version of dhall.
directory = self.dhall_1_28_0;
# spago requires dhall_1_27_0.
dhall = self.dhall_1_27_0;
});
docsSearchAppJsFile = pkgs.fetchurl {
@@ -683,13 +683,9 @@ self: super: builtins.intersectAttrs super {
'';
});
# Haddock generation is broken for spago.
# https://github.com/spacchetti/spago/issues/511
spagoWithoutHaddocks = dontHaddock spagoFixHpack;
# Because of the problem above with pulling in hspec defaults to the
# package.yaml file, the tests are disabled.
spagoWithoutChecks = dontCheck spagoWithoutHaddocks;
spagoWithoutChecks = dontCheck spagoFixHpack;
in
spagoWithoutChecks;
}

View File

@@ -15,5 +15,5 @@ self: super: {
# spago is not released to Hackage.
# https://github.com/spacchetti/spago/issues/512
spago = self.callPackage ../tools/purescript/spago { };
spago = self.callPackage ../tools/purescript/spago/spago.nix { };
}