From c3e61854cbcd046995d9ccbd8e307117ca58b9b8 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Tue, 4 Dec 2018 16:55:17 +0100
Subject: gnu: tzdata: Update to 2018g.

* gnu/packages/base.scm (tzdata): Update to 2018g.
---
 gnu/packages/base.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/base.scm')

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 60f8051dc6..55a0290600 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1097,7 +1097,7 @@ command.")
 (define-public tzdata
   (package
     (name "tzdata")
-    (version "2018e")
+    (version "2018g")
     (source (origin
              (method url-fetch)
              (uri (string-append
@@ -1105,7 +1105,7 @@ command.")
                    version ".tar.gz"))
              (sha256
               (base32
-               "0bk97fv2i5ns42prpmlaadsswdjwv0ifi7whj2s4q6l44rcqwa3b"))))
+               "05kayi3w9pvhj6ljx1hvwd0r8mxfzn436fjmwhx53xkj919xxpq2"))))
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f
@@ -1155,7 +1155,7 @@ command.")
                                 version ".tar.gz"))
                           (sha256
                            (base32
-                            "1kpb02631s58i068mwq63xlamcv1ffj4p6y4wpb9kdl01vr0qd6a"))))))
+                            "09y44fzcdq3c06saa8iqqa0a59cyw6ni3p31ps0j1w3hcpxz8lxa"))))))
     (home-page "https://www.iana.org/time-zones")
     (synopsis "Database of current and historical time zones")
     (description "The Time Zone Database (often called tz or zoneinfo)
-- 
cgit v1.2.3


From 62c75d6d089040daf18c891089e4ff367e924679 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Mon, 10 Dec 2018 01:18:55 +0100
Subject: gnu: tzdata-for-tests: Update to 2018g.

* gnu/packages/base.scm (tzdata-for-tests): Inherit TZDATA.
---
 gnu/packages/base.scm | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'gnu/packages/base.scm')

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 55a0290600..932416a60d 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1173,23 +1173,7 @@ and daylight-saving rules.")
 (define-public tzdata-for-tests
   (hidden-package
    (package
-     (inherit tzdata)
-     (version "2018d")
-     (source (origin
-               (method url-fetch)
-               (uri (string-append "https://www.iana.org/time-zones/repository"
-                                   "/releases/tzdata" version ".tar.gz"))
-               (sha256
-                (base32
-                 "0m6020dnk9r40z7k36jp13fa06xip3hn0fdx3nly66jzxgffs1ji"))))
-     (inputs `(("tzcode" ,(origin
-                            (method url-fetch)
-                            (uri (string-append
-                                  "http://www.iana.org/time-zones/repository/releases/tzcode"
-                                  version ".tar.gz"))
-                            (sha256
-                             (base32
-                              "1nd882yhsazmcfqmcqyfig3axycryl30gmizgqhqsx5dpa2lxr3x")))))))))
+     (inherit tzdata))))
 
 (define-public libiconv
   (package
-- 
cgit v1.2.3


From 1bb9969f83658ec8448e5eb852ae9b1ceb50ec94 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Wed, 9 Jan 2019 15:46:53 -0500
Subject: gnu: tzdata: Update to 2018i.

* gnu/packages/base.scm (tzdata): Update to 2018i.
(tzdata-for-tests): Keep at version 2018g.
---
 gnu/packages/base.scm | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/base.scm')

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 0fed144059..9af04029ba 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1111,7 +1111,7 @@ command.")
 (define-public tzdata
   (package
     (name "tzdata")
-    (version "2018g")
+    (version "2018i")
     (source (origin
              (method url-fetch)
              (uri (string-append
@@ -1119,7 +1119,7 @@ command.")
                    version ".tar.gz"))
              (sha256
               (base32
-               "05kayi3w9pvhj6ljx1hvwd0r8mxfzn436fjmwhx53xkj919xxpq2"))))
+               "1n80ih8agibagic401smqscz3xxqvs5bm5x3lk803g539kw5xi42"))))
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f
@@ -1169,7 +1169,7 @@ command.")
                                 version ".tar.gz"))
                           (sha256
                            (base32
-                            "09y44fzcdq3c06saa8iqqa0a59cyw6ni3p31ps0j1w3hcpxz8lxa"))))))
+                            "1p1jxlnryaxknj0l768h3dmlk2jpqz5n5d24w9c9vyx6dj3xpb5a"))))))
     (home-page "https://www.iana.org/time-zones")
     (synopsis "Database of current and historical time zones")
     (description "The Time Zone Database (often called tz or zoneinfo)
@@ -1187,7 +1187,25 @@ and daylight-saving rules.")
 (define-public tzdata-for-tests
   (hidden-package
    (package
-     (inherit tzdata))))
+     (inherit tzdata)
+     (version "2018g")
+     (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://www.iana.org/time-zones/repository/releases/tzdata"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "05kayi3w9pvhj6ljx1hvwd0r8mxfzn436fjmwhx53xkj919xxpq2"))))
+     (inputs
+       `(("tzcode" ,(origin
+                     (method url-fetch)
+                     (uri (string-append
+                           "http://www.iana.org/time-zones/repository/releases/tzcode"
+                           version ".tar.gz"))
+                     (sha256
+                      (base32
+                       "09y44fzcdq3c06saa8iqqa0a59cyw6ni3p31ps0j1w3hcpxz8lxa")))))))))
 
 (define-public libiconv
   (package
-- 
cgit v1.2.3