summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2018-05-08 00:19:20 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2018-05-11 18:23:40 +0200
commit9d0202faa123aac3067065bb3f2ffd47d4610f0b (patch)
tree80e7f0c53c4d93758e185f740e31c2fabaff11f7 /pkgs/data
parent2f37fecfa1bf207d07b432ba19874f1569019232 (diff)
downloadnixlib-9d0202faa123aac3067065bb3f2ffd47d4610f0b.tar
nixlib-9d0202faa123aac3067065bb3f2ffd47d4610f0b.tar.gz
nixlib-9d0202faa123aac3067065bb3f2ffd47d4610f0b.tar.bz2
nixlib-9d0202faa123aac3067065bb3f2ffd47d4610f0b.tar.lz
nixlib-9d0202faa123aac3067065bb3f2ffd47d4610f0b.tar.xz
nixlib-9d0202faa123aac3067065bb3f2ffd47d4610f0b.tar.zst
nixlib-9d0202faa123aac3067065bb3f2ffd47d4610f0b.zip
tzdata: 2017c -> 2018e
Notable changes:

  - North Korea switches back to +09 on 2018-05-05.
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/misc/tzdata/default.nix16
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 6c8fd6229a3f..9d2790ff1b5f 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -2,28 +2,31 @@
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
-  version = "2017c";
+  version = "2018e";
 
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "02yrrfj0p7ar885ja41ylijzbr8wc6kz6kzlw8c670i9m693ym6n";
+        sha256 = "0bk97fv2i5ns42prpmlaadsswdjwv0ifi7whj2s4q6l44rcqwa3b";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "1dvrq0b2hz7cjqdyd7x21wpy4qcng3rvysr61ij0c2g64fyb9s41";
+        sha256 = "1kpb02631s58i068mwq63xlamcv1ffj4p6y4wpb9kdl01vr0qd6a";
       })
     ];
 
   sourceRoot = ".";
 
-  outputs = [ "out" "man" "dev" ];
+  outputs = [ "out" "bin" "man" "dev" ];
   propagatedBuildOutputs = [];
 
   makeFlags = [
     "TOPDIR=$(out)"
     "TZDIR=$(out)/share/zoneinfo"
+    "BINDIR=$(bin)/bin"
+    "ZICDIR=$(bin)/bin"
     "ETCDIR=$(TMPDIR)/etc"
+    "TZDEFAULT=$(TMPDIR)/etc"
     "LIBDIR=$(dev)/lib"
     "MANDIR=$(man)/share/man"
     "AWK=awk"
@@ -58,9 +61,10 @@ stdenv.mkDerivation rec {
 
   setupHook = ./tzdata-setup-hook.sh;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.iana.org/time-zones;
     description = "Database of current and historical time zones";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ fpletz ];
   };
 }