diff options
| author | Peter Simons <simons@cryp.to> | 2014-01-19 05:14:51 -0800 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-01-19 05:14:51 -0800 |
| commit | 6b6a3af5c33f0b83fb2779d6fa71f583c563774f (patch) | |
| tree | 700edf6366e73f1489b7bd93a304c76b6c74b1b1 /pkgs | |
| parent | 9ee3ff2088e9d9bd78af2b20413c0863c2524c19 (diff) | |
| parent | 1388fc4dc8867562863c5bc377e7f74576928c05 (diff) | |
| download | nixlib-6b6a3af5c33f0b83fb2779d6fa71f583c563774f.tar nixlib-6b6a3af5c33f0b83fb2779d6fa71f583c563774f.tar.gz nixlib-6b6a3af5c33f0b83fb2779d6fa71f583c563774f.tar.bz2 nixlib-6b6a3af5c33f0b83fb2779d6fa71f583c563774f.tar.lz nixlib-6b6a3af5c33f0b83fb2779d6fa71f583c563774f.tar.xz nixlib-6b6a3af5c33f0b83fb2779d6fa71f583c563774f.tar.zst nixlib-6b6a3af5c33f0b83fb2779d6fa71f583c563774f.zip | |
Merge pull request #1543 from ocharles/haskellPackages.timezone
haskellPackages.timezoneOlson/haskellPackages.timezoneSeries: New expressions
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/haskell/timezone-olson/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/libraries/haskell/timezone-series/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 4 |
3 files changed, 34 insertions, 0 deletions
diff --git a/pkgs/development/libraries/haskell/timezone-olson/default.nix b/pkgs/development/libraries/haskell/timezone-olson/default.nix new file mode 100644 index 000000000000..c46090cda9b1 --- /dev/null +++ b/pkgs/development/libraries/haskell/timezone-olson/default.nix @@ -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 ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/timezone-series/default.nix b/pkgs/development/libraries/haskell/timezone-series/default.nix new file mode 100644 index 000000000000..1ce1ca1f768c --- /dev/null +++ b/pkgs/development/libraries/haskell/timezone-series/default.nix @@ -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 ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c3addca97d1e..b67f44daae8c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -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 {}; |