amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Marius Bakke 2019-12-05 17:57:35 +01:00
commit 9d5aa00906
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
284 changed files with 18112 additions and 13018 deletions
Download patch file Download diff file Expand all files Collapse all files

26
gnu/packages/base.scm
View file

@ -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