Merge pull request #1543 from ocharles/haskellPackages.timezone

haskellPackages.timezoneOlson/haskellPackages.timezoneSeries: New expressions
This commit is contained in:
Peter Simons 2014-01-19 05:14:51 -08:00
commit 6b6a3af5c3
3 changed files with 34 additions and 0 deletions

View file

@ -0,0 +1,15 @@
{ cabal, binary, extensibleExceptions, time, timezoneSeries }:
cabal.mkDerivation (self: {
pname = "timezone-olson";
version = "0.1.2";
sha256 = "1dp0nppvx732c27pybbyqw6jkx4kdgfc6vnc539m0xv005afpq9y";
buildDepends = [ binary extensibleExceptions time timezoneSeries ];
meta = {
homepage = "http://projects.haskell.org/time-ng/";
description = "A pure Haskell parser and renderer for binary Olson timezone files";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

View file

@ -0,0 +1,15 @@
{ cabal, time }:
cabal.mkDerivation (self: {
pname = "timezone-series";
version = "0.1.2";
sha256 = "0clvm1kwmxid5bhb74vgrpzynn4sff2k6mfzb43i7737w5fy86gp";
buildDepends = [ time ];
meta = {
homepage = "http://projects.haskell.org/time-ng/";
description = "Enhanced timezone handling for Data.Time";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

View file

@ -2271,6 +2271,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
# pass it explicitly in rare circumstances.
time = null;
timezoneOlson = callPackage ../development/libraries/haskell/timezone-olson {};
timezoneSeries = callPackage ../development/libraries/haskell/timezone-series {};
timeCompat = callPackage ../development/libraries/haskell/time-compat {};
tls = callPackage ../development/libraries/haskell/tls {};