From 838c7a80f7d7cfadfcbe01f55220f7ab26e0ecb1 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Wed, 11 Mar 2020 16:04:09 -0700
Subject: [PATCH] haskellPackages.EdisonCore: Unbreak
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
.../haskell-modules/configuration-common.nix | 20 +++++++++++++++++++
.../configuration-hackage2nix.yaml | 2 --
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 16ae6e040de5..a89a704f99d5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1476,4 +1476,24 @@ self: super: {
persistent-mysql = dontCheck super.persistent-mysql;
+ # Fix EdisonAPI and EdisonCore for GHC 8.8:
+ # https://github.com/robdockins/edison/pull/16
+ EdisonAPI = appendPatch super.EdisonAPI (pkgs.fetchpatch {
+ url = "https://github.com/robdockins/edison/pull/16/commits/8da6c0f7d8666766e2f0693425c347c0adb492dc.patch";
+ postFetch = ''
+ ${pkgs.patchutils}/bin/filterdiff --include='a/edison-api/*' --strip=1 "$out" > "$tmpfile"
+ mv "$tmpfile" "$out"
+ '';
+ sha256 = "0yi5pz039lcm4pl9xnl6krqxyqq5rgb5b6m09w0sfy06x0n4x213";
+ });
+
+ EdisonCore = appendPatch super.EdisonCore (pkgs.fetchpatch {
+ url = "https://github.com/robdockins/edison/pull/16/commits/8da6c0f7d8666766e2f0693425c347c0adb492dc.patch";
+ postFetch = ''
+ ${pkgs.patchutils}/bin/filterdiff --include='a/edison-core/*' --strip=1 "$out" > "$tmpfile"
+ mv "$tmpfile" "$out"
+ '';
+ sha256 = "097wqn8hxsr50b9mhndg5pjim5jma2ym4ylpibakmmb5m98n17zp";
+ });
+
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 0b585f824e4a..7a0f798c8f0e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -4381,8 +4381,6 @@ broken-packages:
- edentv
- edge
- edges
- - EdisonAPI
- - EdisonCore
- edit
- edit-lenses
- editable