ghc881 - alex: point directly to working commit
This commit is contained in:
parent
fc06be9341
commit
6facf5b594
|
@ -147,7 +147,6 @@ self: super: {
|
|||
});
|
||||
system-fileio = doJailbreak super.system-fileio;
|
||||
tasty-hedgehog = doJailbreak super.tasty-hedgehog;
|
||||
yaml = super.yaml;
|
||||
haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
|
||||
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch";
|
||||
sha256 = "1asl932mibr5y057xx8v1a7n3qy87lcnclsfh8pbxq1m3iwjkxy8";
|
||||
|
@ -160,8 +159,14 @@ self: super: {
|
|||
vault = dontHaddock super.vault;
|
||||
|
||||
# The test suite does not know how to find the 'alex' binary.
|
||||
# TODO remove patch when alex gets a newer release than 3.2.4
|
||||
alex = overrideCabal (appendPatch super.alex ./patches/alex-3.2.4-ghc8.8.x.patch) (drv: {
|
||||
alex = overrideCabal (overrideSrc super.alex {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "simonmar";
|
||||
repo = "alex";
|
||||
rev = "11042dbcc45382c57216eecb1438b625e1cca350";
|
||||
sha256 = "03ywnf0mh3fzb636kq8gjz0vs06qg9kqi3lsh0b24wsfw7pppysr";
|
||||
};
|
||||
}) (drv: {
|
||||
testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which];
|
||||
preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"'';
|
||||
});
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
From deaae6eddef5186bfd0e42e2c3ced39e26afa4d6 Mon Sep 17 00:00:00 2001
|
||||
From: "Joseph C. Sible" <josephcsible@users.noreply.github.com>
|
||||
Date: Sat, 31 Aug 2019 21:19:37 -0400
|
||||
Subject: [PATCH] Remove fail from default_typeclass test
|
||||
|
||||
This was added when we copied in StateT from MTL, but we don't actually
|
||||
use it. Since the MonadFail Proposal was finished in GHC 8.8.1, it now
|
||||
breaks compiling, so remove it.
|
||||
---
|
||||
tests/default_typeclass.x | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/tests/default_typeclass.x b/tests/default_typeclass.x
|
||||
index fb06684..5491e28 100644
|
||||
--- a/tests/default_typeclass.x
|
||||
+++ b/tests/default_typeclass.x
|
||||
@@ -285,7 +285,6 @@ instance (Monad m) => Monad (StateT s m) where
|
||||
m >>= k = StateT $ \s -> do
|
||||
(a, s') <- runStateT m s
|
||||
runStateT (k a) s'
|
||||
- fail str = StateT $ \_ -> fail str
|
||||
|
||||
-- | Fetch the current value of the state within the monad.
|
||||
get' :: (Monad m) => StateT s m s
|
||||
--
|
||||
2.16.1
|
||||
|
Loading…
Reference in New Issue