diff options
| author | Luc Tielen <luc.tielen@kabisa.nl> | 2019-09-16 22:39:07 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2019-09-18 19:36:58 +0200 |
| commit | 6facf5b59400e37caa7bb2003139ad7d05ba5488 (patch) | |
| tree | b9d494d2c224ad736e340a4f443f7e711c83ff07 /pkgs | |
| parent | fc06be9341d103ae503711dbca390487d48a7f36 (diff) | |
| download | nixpkgs-6facf5b59400e37caa7bb2003139ad7d05ba5488.tar nixpkgs-6facf5b59400e37caa7bb2003139ad7d05ba5488.tar.gz nixpkgs-6facf5b59400e37caa7bb2003139ad7d05ba5488.tar.bz2 nixpkgs-6facf5b59400e37caa7bb2003139ad7d05ba5488.tar.lz nixpkgs-6facf5b59400e37caa7bb2003139ad7d05ba5488.tar.xz nixpkgs-6facf5b59400e37caa7bb2003139ad7d05ba5488.tar.zst nixpkgs-6facf5b59400e37caa7bb2003139ad7d05ba5488.zip | |
ghc881 - alex: point directly to working commit
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/patches/alex-3.2.4-ghc8.8.x.patch | 27 |
2 files changed, 8 insertions, 30 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 9ab397323e5..2188b8d0091 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -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"''; }); 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 deleted file mode 100644 index 47efdfda860..00000000000 --- a/pkgs/development/haskell-modules/patches/alex-3.2.4-ghc8.8.x.patch +++ /dev/null @@ -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 - |