From 5b485337cf5a5c5144de5be11f1a74380aae6766 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Jun 2021 03:25:20 +0200 Subject: [PATCH 1/2] tzdata: 2020f -> 2021a --- pkgs/data/misc/tzdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 7ab25da3cc43..01500b96682c 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "tzdata"; - version = "2020f"; + version = "2021a"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "10b8cr55x6ji14n3kqkn3avj1s9b79b8gszh81fxrrisij8k248j"; + sha256 = "022fn6gkmp7pamlgab04x0dm5hnyn2m2fcnyr3pvm36612xd5rrr"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "1i998crd9fxdfhv4jd241j1arx0ng7j7cvczpmj4y5j5fwmfmvng"; + sha256 = "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb"; }) ]; From 99b4d189e2d58e32984e42de75651d2b24f49abc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Jun 2021 14:35:04 +0200 Subject: [PATCH 2/2] tzdata: add licenses https://github.com/eggert/tz/blob/main/LICENSE --- pkgs/data/misc/tzdata/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 01500b96682c..aa3d9e787b68 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -68,6 +68,10 @@ stdenv.mkDerivation rec { homepage = "http://www.iana.org/time-zones"; description = "Database of current and historical time zones"; changelog = "https://github.com/eggert/tz/blob/${version}/NEWS"; + license = with licenses; [ + bsd3 # tzcode + publicDomain # tzdata + ]; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; };