public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell-dhall: update overrides for the latest version

This commit is contained in:
Peter Simons 2019-12-06 20:16:42 +01:00
parent cd9816e0f7
commit fc8ccfa780
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1052,8 +1052,7 @@ self: super: {
generateOptparseApplicativeCompletion "dhall" ( generateOptparseApplicativeCompletion "dhall" (
dontCheck super.dhall dontCheck super.dhall
); );
dhall_1_27_0 = dontCheck super.dhall_1_27_0; dhall_1_28_0 = dontCheck super.dhall_1_28_0;
# Missing test files in source distribution, fixed once 1.4.0 is bumped # Missing test files in source distribution, fixed once 1.4.0 is bumped
# https://github.com/dhall-lang/dhall-haskell/pull/997 # https://github.com/dhall-lang/dhall-haskell/pull/997
@ -1210,8 +1209,8 @@ self: super: {
temporary-resourcet = doJailbreak super.temporary-resourcet; temporary-resourcet = doJailbreak super.temporary-resourcet;
# Requires dhall >= 1.23.0 # Requires dhall >= 1.23.0
ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_27_0; }; ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_28_0; };
dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_27_0; }; dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_28_0; };
# Test suite doesn't work with current QuickCheck # Test suite doesn't work with current QuickCheck
# https://github.com/pruvisto/heap/issues/11 # https://github.com/pruvisto/heap/issues/11

2
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -645,7 +645,7 @@ self: super: builtins.intersectAttrs super {
# LTS-14. # LTS-14.
spagoWithOverrides = doJailbreak (super.spago.override { spagoWithOverrides = doJailbreak (super.spago.override {
# spago requires the latest version of dhall. # spago requires the latest version of dhall.
directory = self.dhall_1_27_0; directory = self.dhall_1_28_0;
}); });
docsSearchAppJsFile = pkgs.fetchurl { docsSearchAppJsFile = pkgs.fetchurl {