From 7914242b377b35dabcf8c38150d005bc7e5b3199 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Jun 2016 16:50:36 +0200 Subject: [PATCH] haskell-timezone-series: fix build with GHC 8.0.1 - Fix the incorrect sha256 hash of the patch. - Apply the patch only when compiling with GHC 8.0.x. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- .../haskell-modules/configuration-ghc-8.0.x.nix | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6092ec5a7d3..c9e38e1e17c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1041,8 +1041,4 @@ self: super: { ''; })); - timezone-series = appendPatch super.timezone-series (pkgs.fetchpatch { - url = "https://github.com/ryantrinkle/timezone-series/commit/f8dece8c016db6476e2bb0d4f972769a76f6ff40.patch"; - sha256 = "02sgciica2pzaal7wwp36v6iybr1hjypda0zljxylnq0qs8bizhy"; - }); } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index c11381a9603..530e62047b9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -62,4 +62,11 @@ self: super: { sha256 = "1i45196qrzlhgbisnvkzni4n54saky0i1kyla162xcb5cg3kf2ji"; }; }); + + # https://github.com/ygale/timezone-series/issues/2 + timezone-series = appendPatch super.timezone-series (pkgs.fetchpatch { + url = "https://github.com/ryantrinkle/timezone-series/commit/f8dece8c016db6476e2bb0d4f972769a76f6ff40.patch"; + sha256 = "01wxhknsnn7lyl9v8viz7m5zhmyi3bqpbva7d3dx1dxn0nmkfh6a"; + }); + }