diff options
| author | Anders Kaseorg <andersk@mit.edu> | 2020-03-11 16:04:09 -0700 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-03-13 20:24:53 +0100 |
| commit | 838c7a80f7d7cfadfcbe01f55220f7ab26e0ecb1 (patch) | |
| tree | 3f2dd55f33b73cc5cb93e9af46a5644279e4cdfb /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | ef65c6382d59e4de825eb9bcca5911e23c312ede (diff) | |
| download | nixpkgs-838c7a80f7d7cfadfcbe01f55220f7ab26e0ecb1.tar nixpkgs-838c7a80f7d7cfadfcbe01f55220f7ab26e0ecb1.tar.gz nixpkgs-838c7a80f7d7cfadfcbe01f55220f7ab26e0ecb1.tar.bz2 nixpkgs-838c7a80f7d7cfadfcbe01f55220f7ab26e0ecb1.tar.lz nixpkgs-838c7a80f7d7cfadfcbe01f55220f7ab26e0ecb1.tar.xz nixpkgs-838c7a80f7d7cfadfcbe01f55220f7ab26e0ecb1.tar.zst nixpkgs-838c7a80f7d7cfadfcbe01f55220f7ab26e0ecb1.zip | |
haskellPackages.EdisonCore: Unbreak
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 16ae6e040de..a89a704f99d 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 |