diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-14 16:24:34 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-14 16:24:34 +0200 |
| commit | 4193095e18b602705df94e38a8d60ef1fe380e49 (patch) | |
| tree | 2500f31bcfae9b4cb5a23d633395f6892a7bd8a7 /gnu/packages/base.scm | |
| parent | a48a3f0640d76cb5e5945557c9aae6dabce39d93 (diff) | |
| parent | e88745a655b220b4047f7db5175c828ef9c33e11 (diff) | |
| download | guix-patches-4193095e18b602705df94e38a8d60ef1fe380e49.tar guix-patches-4193095e18b602705df94e38a8d60ef1fe380e49.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index ecea6c97d4..4b5f94b277 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1351,7 +1351,7 @@ command.") (define-public tzdata (package (name "tzdata") - (version "2019c") + (version "2020a") (source (origin (method url-fetch) (uri (string-append @@ -1359,7 +1359,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr")))) + "18lrp0zh8m931jjlrv8lvjas4ka5dfkzdbwnbw5lwd2dlbn62wal")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -1409,7 +1409,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn")))))) + "0sfnlqw1p93r7klny69rwr94fh22mz632h52phgzfgg01q9gfakx")))))) (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) @@ -1426,7 +1426,26 @@ and daylight-saving rules.") ;;; package. (define-public tzdata-for-tests (hidden-package - (package/inherit tzdata))) + (package + (inherit tzdata) + (version "2019c") + (source (origin + (method url-fetch) + (uri (string-append + "https://data.iana.org/time-zones/releases/tzdata" + version ".tar.gz")) + (sha256 + (base32 + "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr")))) + (inputs + `(("tzcode" ,(origin + (method url-fetch) + (uri (string-append + "https://data.iana.org/time-zones/releases/tzcode" + version ".tar.gz")) + (sha256 + (base32 + "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn"))))))))) (define-public libiconv (package |