From 9b2394519c194df17c3028caa92be7ba50cbb710 Mon Sep 17 00:00:00 2001 From: Luc Tielen Date: Sun, 15 Sep 2019 19:33:25 +0200 Subject: haskell.packages.ghc881.alex: apply temporary patch for ghc881 --- .../haskell-modules/configuration-common.nix | 2 +- .../patches/alex-3.2.4-ghc8.8.x.patch | 27 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/haskell-modules/patches/alex-3.2.4-ghc8.8.x.patch (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c4cca42309db..88557fba1626 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1005,7 +1005,7 @@ self: super: { spdx = dontCheck super.spdx; # The test suite does not know how to find the 'alex' binary. - alex = overrideCabal super.alex (drv: { + alex = overrideCabal (appendPatch super.alex ./patches/alex-3.2.4-ghc8.8.x.patch) (drv: { testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which]; preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"''; }); diff --git a/pkgs/development/haskell-modules/patches/alex-3.2.4-ghc8.8.x.patch b/pkgs/development/haskell-modules/patches/alex-3.2.4-ghc8.8.x.patch new file mode 100644 index 000000000000..47efdfda860c --- /dev/null +++ b/pkgs/development/haskell-modules/patches/alex-3.2.4-ghc8.8.x.patch @@ -0,0 +1,27 @@ +From deaae6eddef5186bfd0e42e2c3ced39e26afa4d6 Mon Sep 17 00:00:00 2001 +From: "Joseph C. Sible" +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 + -- cgit 1.4.1