diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-14 17:04:55 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-14 17:04:55 +0200 |
| commit | ff97b7dbe6aef98b105c8af34f19232aa7d49d80 (patch) | |
| tree | b44b52b9a17a84c84d179c1cafd3a3425c62751a /pkgs/data | |
| parent | 0b82b9532229a28758df482218222d90d910c494 (diff) | |
| parent | b57bc220cc04e3d8f931b604e5acc44544b8c1c0 (diff) | |
| download | nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.gz nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.bz2 nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.lz nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.xz nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.zst nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/misc/tzdata/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 71153d88499..90111cb52e1 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -let version = "2014b"; in +let version = "2014e"; in stdenv.mkDerivation rec { name = "tzdata-${version}"; @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { srcs = [ (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; - sha256 = "1d8w5g7fy8nrdj092cwmxdxw6rk3bzwpxqpz6l5sra2kqbhg7qfi"; + sha256 = "1ic63ykplnrvh9704j6l089rais0nxw1lcf1dbc3iy2ij2kl7qh8"; }) (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; - sha256 = "12x7ahbjxc3sj4ykcvx5c7kw1nbn6ywm8wzq6303y3l8qyqd7nmm"; + sha256 = "074c98vmdgysgkksaqwkn1gbrlnzk8l28zs8lhif44a9mckc9ss3"; }) ]; |