diff options
| author | Maxim Cournoyer <maxim@guixotic.coop> | 2025-11-05 08:24:59 +0900 |
|---|---|---|
| committer | Maxim Cournoyer <maxim@guixotic.coop> | 2025-11-19 09:42:12 +0900 |
| commit | e92f831862341fe9acbae2df0c47582d448f458c (patch) | |
| tree | 13298df6663206f1feea20d946c685cddaf1e96a | |
| parent | 8df23176179963fe3157eabfb68437f31eab49c7 (diff) | |
gnu: tzdata: Install leap-seconds.list file.
* gnu/packages/base.scm (tzdata/leap-seconds): Delete variable.
(tzdata) [#:phases] {post-install}: Install leap-seconds.list.
Change-Id: I86cefd027e945281fd7ab5d966c770163d69b484
| -rw-r--r-- | gnu/packages/base.scm | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 14c9728d38c..ca08ae8ed1e 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm | |||
| @@ -1733,7 +1733,9 @@ command.") | |||
| 1733 | (copy-recursively (string-append out "/share/zoneinfo-leaps") | 1733 | (copy-recursively (string-append out "/share/zoneinfo-leaps") |
| 1734 | (string-append out "/share/zoneinfo/right")) | 1734 | (string-append out "/share/zoneinfo/right")) |
| 1735 | (delete-file-recursively | 1735 | (delete-file-recursively |
| 1736 | (string-append out "/share/zoneinfo-leaps"))))) | 1736 | (string-append out "/share/zoneinfo-leaps")) |
| 1737 | (install-file "leap-seconds.list" | ||
| 1738 | (string-append out "/share/zoneinfo"))))) | ||
| 1737 | (delete 'configure)))) | 1739 | (delete 'configure)))) |
| 1738 | (inputs (list (origin | 1740 | (inputs (list (origin |
| 1739 | (method url-fetch) | 1741 | (method url-fetch) |
| @@ -1762,20 +1764,6 @@ and daylight-saving rules.") | |||
| 1762 | ;;; package. | 1764 | ;;; package. |
| 1763 | (define-public tzdata-for-tests tzdata) | 1765 | (define-public tzdata-for-tests tzdata) |
| 1764 | 1766 | ||
| 1765 | ;;; TODO: Move the 'install-leap-seconds' phase into the main package's | ||
| 1766 | ;;; 'post-install' phase on the next rebuild cycle. | ||
| 1767 | (define-public tzdata/leap-seconds | ||
| 1768 | (hidden-package | ||
| 1769 | (package/inherit tzdata | ||
| 1770 | (arguments | ||
| 1771 | (substitute-keyword-arguments (package-arguments tzdata) | ||
| 1772 | ((#:phases phases) | ||
| 1773 | #~(modify-phases #$phases | ||
| 1774 | (add-after 'post-install 'install-leap-seconds | ||
| 1775 | (lambda _ | ||
| 1776 | (install-file "leap-seconds.list" | ||
| 1777 | (string-append #$output "/share/zoneinfo"))))))))))) | ||
| 1778 | |||
| 1779 | (define-public libiconv | 1767 | (define-public libiconv |
| 1780 | (package | 1768 | (package |
| 1781 | (name "libiconv") | 1769 | (name "libiconv") |
