diff options
| author | Peter Simons <simons@cryp.to> | 2016-09-13 07:41:51 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2016-09-13 09:11:57 +0200 |
| commit | 6780ac9d033feeb4bbbf15fea547c91471bfa2bd (patch) | |
| tree | 0eeadd06d108cc6b3023c8748906443b0e06289c | |
| parent | 2f2243433f4df69e78f7ea484188ae6e5343dea0 (diff) | |
| download | nixlib-6780ac9d033feeb4bbbf15fea547c91471bfa2bd.tar nixlib-6780ac9d033feeb4bbbf15fea547c91471bfa2bd.tar.gz nixlib-6780ac9d033feeb4bbbf15fea547c91471bfa2bd.tar.bz2 nixlib-6780ac9d033feeb4bbbf15fea547c91471bfa2bd.tar.lz nixlib-6780ac9d033feeb4bbbf15fea547c91471bfa2bd.tar.xz nixlib-6780ac9d033feeb4bbbf15fea547c91471bfa2bd.tar.zst nixlib-6780ac9d033feeb4bbbf15fea547c91471bfa2bd.zip | |
haskell-timezone-series: clean up overrides
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 3ffce7a52ecc..a0f8056c081c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -123,7 +123,6 @@ self: super: { prePatch = "sed -i 's|4\.8|4.9|' diagrams-core.cabal"; }); - timezone-series = doJailbreak super.timezone-series; timezone-olson = doJailbreak super.timezone-olson; xmonad-extras = overrideCabal super.xmonad-extras (drv: { postPatch = '' 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 a18ee496012a..5c7348678b7e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -54,13 +54,6 @@ self: super: { broken = true; # needs template-haskell >=2.9 && <2.11 }) {}; - # https://github.com/ygale/timezone-series/issues/2 - timezone-series_0_1_5_1 = appendPatch super.timezone-series_0_1_5_1 (pkgs.fetchpatch { - url = "https://github.com/ryantrinkle/timezone-series/commit/f8dece8c016db6476e2bb0d4f972769a76f6ff40.patch"; - sha256 = "01wxhknsnn7lyl9v8viz7m5zhmyi3bqpbva7d3dx1dxn0nmkfh6a"; - }); - timezone-series = self.timezone-series_0_1_5_1; - # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch"; |