diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-12-04 20:12:41 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-12-04 20:12:41 +0100 |
| commit | 33b59c1a3edbb81735e8d4e977b107f3ba1c2f9f (patch) | |
| tree | 79ee86a29266d0a32ec0d0aa790ee5904b1098b8 /gnu/packages/base.scm | |
| parent | 936aa05209402dd399869ffae188db5dd5f67d69 (diff) | |
| parent | d733a469d74f74734825f1ce777956fb4cac5534 (diff) | |
| download | guix-33b59c1a3edbb81735e8d4e977b107f3ba1c2f9f.tar.gz | |
Merge branch 'staging'
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 3a3360dc7a..e8150708c0 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1196,7 +1196,7 @@ command.") (define-public tzdata (package (name "tzdata") - (version "2019b") + (version "2019c") (source (origin (method url-fetch) (uri (string-append @@ -1204,7 +1204,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "0r0clnlslwm15m1c61dinf1fi9ffgl6aipng7i7yryfwj0n0kn85")))) + "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -1254,7 +1254,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "0vbmswvv3li25s31shyllq5v24449lxnrki9hr043nipjd09sirf")))))) + "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn")))))) (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) @@ -1272,7 +1272,25 @@ and daylight-saving rules.") (define-public tzdata-for-tests (hidden-package (package - (inherit tzdata)))) + (inherit tzdata) + (version "2019b") + (source (origin + (method url-fetch) + (uri (string-append + "https://data.iana.org/time-zones/releases/tzdata" + version ".tar.gz")) + (sha256 + (base32 + "0r0clnlslwm15m1c61dinf1fi9ffgl6aipng7i7yryfwj0n0kn85")))) + (inputs + `(("tzcode" ,(origin + (method url-fetch) + (uri (string-append + "https://data.iana.org/time-zones/releases/tzcode" + version ".tar.gz")) + (sha256 + (base32 + "0vbmswvv3li25s31shyllq5v24449lxnrki9hr043nipjd09sirf"))))))))) (define-public libiconv (package |