diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-19 12:33:04 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-19 12:33:04 +0200 |
commit | e75740455546f85cbf9849907b1f6520fdb487d8 (patch) | |
tree | 02ab162a81b88bcf1e116b6cbb180557c33ba9b9 /pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | |
parent | a02e5ad9263e508b4df6a3e5841e95bace0e787b (diff) | |
parent | 410aad942fc82bbeb9c30a4fdf826ed33998a593 (diff) |
Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1279790
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 7 |
1 files changed, 7 insertions, 0 deletions
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 c11381a960395..530e62047b985 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"; + }); + } |