diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-12-14 11:55:07 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-12-14 11:55:07 +0100 |
| commit | c4a1b6c2ba479c6abcd22cab6a1fcd560469e986 (patch) | |
| tree | 057fb773fcac4200ea66a0267a818be61cca3104 /gnu/packages/base.scm | |
| parent | 2ed11b3a3e05549ed6ef8a604464f424c0eeae1c (diff) | |
| parent | 45c5b47b96a238c764c2d32966267f7f897bcc3d (diff) | |
| download | guix-c4a1b6c2ba479c6abcd22cab6a1fcd560469e986.tar guix-c4a1b6c2ba479c6abcd22cab6a1fcd560469e986.tar.gz | |
Merge branch 'master' into 'core-updates'.
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index e2ec52a45b..aec8d8949c 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2014 Alex Kost <alezost@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -500,7 +501,7 @@ with the Linux kernel.") (define-public tzdata (package (name "tzdata") - (version "2014a") + (version "2014j") (source (origin (method url-fetch) (uri (string-append @@ -508,7 +509,7 @@ with the Linux kernel.") version ".tar.gz")) (sha256 (base32 - "1cg843ajz4g16axpz56zvalwsbp1s764na2bk4fb44ayx162bzvw")))) + "038fvj6zf51k6z9sbbxbj87ajaf69l3whal2vwshbm4l0qr71n52")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -555,7 +556,7 @@ with the Linux kernel.") version ".tar.gz")) (sha256 (base32 - "1xfkqi1q8cnxqbv8azdj5pqlzhkjz6xag09f1z0s8rxi86jkpf85")))))) + "1qpd12imy7q5hb5fhk48mfw65s0xlrkmms0zr2gk0mj88qjn3m3z")))))) (home-page "http://www.iana.org/time-zones") (synopsis "Database of current and historical time zones") (description "The Time Zone Database (often called tz or zoneinfo) |