git.iko.soy/typeable/nixpkgs
on master help sign in
ghc881 - alex: point directly to working commit
commit6facf5b59400e37caa7bb2003139ad7d05ba5488 authorLuc Tielen <luc.tielen@kabisa.nl> dateMon 16 Sep 2019, 22:39 (7 years ago) parentfc06be9
2 files changed+8−30
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix+8−3 pkgs/development/haskell-modules/patches/alex-3.2.4-ghc8.8.x.patch−27
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix+8−3
@@ -147,7 +147,6 @@ self: super: {
147147 });
148148 system-fileio = doJailbreak super.system-fileio;
149149 tasty-hedgehog = doJailbreak super.tasty-hedgehog;
150− yaml = super.yaml;
151150 haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
152151 url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch";
153152 sha256 = "1asl932mibr5y057xx8v1a7n3qy87lcnclsfh8pbxq1m3iwjkxy8";
@@ -160,8 +159,14 @@ self: super: {
160159 vault = dontHaddock super.vault;
161160
162161 # The test suite does not know how to find the 'alex' binary.
163− # TODO remove patch when alex gets a newer release than 3.2.4
164− alex = overrideCabal (appendPatch super.alex ./patches/alex-3.2.4-ghc8.8.x.patch) (drv: {
162+ alex = overrideCabal (overrideSrc super.alex {
163+ src = pkgs.fetchFromGitHub {
164+ owner = "simonmar";
165+ repo = "alex";
166+ rev = "11042dbcc45382c57216eecb1438b625e1cca350";
167+ sha256 = "03ywnf0mh3fzb636kq8gjz0vs06qg9kqi3lsh0b24wsfw7pppysr";
168+ };
169+ }) (drv: {
165170 testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which];
166171 preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"'';
167172 });
pkgs/development/haskell-modules/patches/alex-3.2.4-ghc8.8.x.patchdeleted−27
@@ -1,27 +0,0 @@
1−From deaae6eddef5186bfd0e42e2c3ced39e26afa4d6 Mon Sep 17 00:00:00 2001
2−From: "Joseph C. Sible" <josephcsible@users.noreply.github.com>
3−Date: Sat, 31 Aug 2019 21:19:37 -0400
4−Subject: [PATCH] Remove fail from default_typeclass test
5−
6−This was added when we copied in StateT from MTL, but we don't actually
7−use it. Since the MonadFail Proposal was finished in GHC 8.8.1, it now
8−breaks compiling, so remove it.
9−---
10− tests/default_typeclass.x | 1 -
11− 1 file changed, 1 deletion(-)
12−
13−diff --git a/tests/default_typeclass.x b/tests/default_typeclass.x
14−index fb06684..5491e28 100644
15−--- a/tests/default_typeclass.x
16−+++ b/tests/default_typeclass.x
17−@@ -285,7 +285,6 @@ instance (Monad m) => Monad (StateT s m) where
18− m >>= k = StateT $ \s -> do
19− (a, s') <- runStateT m s
20− runStateT (k a) s'
21−- fail str = StateT $ \_ -> fail str
22−
23− -- | Fetch the current value of the state within the monad.
24− get' :: (Monad m) => StateT s m s
25−--
26−2.16.1
27−