diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-26 21:48:26 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-26 21:48:26 +0100 |
| commit | b5ff06eda4d2f497860b70bc681366a129409717 (patch) | |
| tree | 18ef676d62578f8b40c638b4fd6618379c87575f /pkgs/data | |
| parent | 1e5242931b938e2e5ae79ee7c7d2cf567024090b (diff) | |
| parent | b1803465d9221639a0a0073d7dcb9ef4262b5f3f (diff) | |
| download | nixlib-b5ff06eda4d2f497860b70bc681366a129409717.tar nixlib-b5ff06eda4d2f497860b70bc681366a129409717.tar.gz nixlib-b5ff06eda4d2f497860b70bc681366a129409717.tar.bz2 nixlib-b5ff06eda4d2f497860b70bc681366a129409717.tar.lz nixlib-b5ff06eda4d2f497860b70bc681366a129409717.tar.xz nixlib-b5ff06eda4d2f497860b70bc681366a129409717.tar.zst nixlib-b5ff06eda4d2f497860b70bc681366a129409717.zip | |
Merge branch '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 3b4a4cc74c7e..df3f3ec82246 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -let version = "2014i"; in +let version = "2014j"; 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 = "0lv1i3ikibf9yn1l3hcy00x5ghwxn87k1myyp1cyr55psayk3wra"; + sha256 = "038fvj6zf51k6z9sbbxbj87ajaf69l3whal2vwshbm4l0qr71n52"; }) (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; - sha256 = "10s7x24lh2vm3magl7dq2xs9pw47hhyaq6xpi6c4aiqdzdsi0nb2"; + sha256 = "1qpd12imy7q5hb5fhk48mfw65s0xlrkmms0zr2gk0mj88qjn3m3z"; }) ]; |