From 1c9d5306fb4686ccaf8db36d18a39641e29071cf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 16 Mar 2016 05:41:47 +0100 Subject: [PATCH] tzdata: 2015g -> 2016a --- pkgs/data/misc/tzdata/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 045a9eef00a6..7e53b67e332f 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -1,25 +1,32 @@ { stdenv, fetchurl }: -let version = "2015g"; in - stdenv.mkDerivation rec { name = "tzdata-${version}"; + version = "2016a"; srcs = [ (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; - sha256 = "0qb1awqrn3215zd2jikpqnmkzrxwfjf0d3dw2xmnk4c40yzws8xr"; + sha256 = "1lccd8f8fiwfyr1f6c2ad1rgd58qlmrk5b00ywg95vv49qr6pyjy"; }) (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; - sha256 = "1i3y1kzjiz2j62c7vd4wf85983sqk9x9lg3473njvbdz4kph5r0q"; + sha256 = "13f2412ywphrvslmp1cjfyyjfrk67gbrsk4ih5n8qkl4kgandbhi"; }) ]; sourceRoot = "."; outputs = [ "out" "lib" ]; - makeFlags = "TOPDIR=$(out) TZDIR=$(out)/share/zoneinfo ETCDIR=$(TMPDIR)/etc LIBDIR=$(lib)/lib MANDIR=$(TMPDIR)/man AWK=awk CFLAGS=-DHAVE_LINK=0"; + makeFlags = [ + "TOPDIR=$(out)" + "TZDIR=$(out)/share/zoneinfo" + "ETCDIR=$(TMPDIR)/etc" + "LIBDIR=$(lib)/lib" + "MANDIR=$(TMPDIR)/man" + "AWK=awk" + "CFLAGS=-DHAVE_LINK=0" + ]; postInstall = ''