summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2015-08-25 14:14:54 +0200
committerDomen Kožar <domen@dev.si>2015-08-25 14:14:54 +0200
commite4644a5b582703e6fa3b1c2e97a99e3bc3f7ce4c (patch)
treef0f4637a7357352ae45007b99e384bebf7176520 /pkgs/data
parent60a0bb7f66fd51a5b935ed50f8f39a34a5fc55cc (diff)
parentc234f37b5995457e2a5b518648e6735612cb3c27 (diff)
downloadnixlib-e4644a5b582703e6fa3b1c2e97a99e3bc3f7ce4c.tar
nixlib-e4644a5b582703e6fa3b1c2e97a99e3bc3f7ce4c.tar.gz
nixlib-e4644a5b582703e6fa3b1c2e97a99e3bc3f7ce4c.tar.bz2
nixlib-e4644a5b582703e6fa3b1c2e97a99e3bc3f7ce4c.tar.lz
nixlib-e4644a5b582703e6fa3b1c2e97a99e3bc3f7ce4c.tar.xz
nixlib-e4644a5b582703e6fa3b1c2e97a99e3bc3f7ce4c.tar.zst
nixlib-e4644a5b582703e6fa3b1c2e97a99e3bc3f7ce4c.zip
Merge branch 'staging'
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/misc/tzdata/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 6d10fe68a099..8789316ccdc4 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-let version = "2015e"; in
+let version = "2015f"; 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 = "0vxs6j1i429vxz4a1lbwjz81k236lxdggqvrlix2ga5xib9vbjgz";
+        sha256 = "07ak8ai5skgjpj6lg74pawxg0bz998k7s2ah7jqyqhp086sq37wm";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "185db6789kygcpcl48y1dh6m4fkgqcwqjwx7f3s5dys7b2sig8mm";
+        sha256 = "1bl4vqw6yp9199clm9aai566bmslp42g5xglj3vl24dn5fjf158c";
       })
     ];