diff options
| author | Ian Eure <ian@retrospec.tv> | 2024-02-13 12:34:03 -0800 |
|---|---|---|
| committer | Clément Lassieur <clement@lassieur.org> | 2024-02-16 14:56:27 +0100 |
| commit | cf842e9b20b89ecb08ac3456a91780ec07b5a201 (patch) | |
| tree | 66ca6d4d29df6d022fb3d26160c2bad103cd65b0 | |
| parent | 8fee233246c75aff0a1daa420604d7c60ae434f5 (diff) | |
| download | guix-cf842e9b20b89ecb08ac3456a91780ec07b5a201.tar.gz guix-cf842e9b20b89ecb08ac3456a91780ec07b5a201.zip | |
gnu: icu4c-73: Move it from gnuzilla.scm to icu4c.scm.
* gnu/packages/gnuzilla.scm (icu4c-73-promise): Delete variable.
(icecat-minimal)[inputs]: Use ‘icu4c-73’ instead of the promise.
* gnu/packages/icu4c.scm (icu4c-73): New variable.
(make-torbrowser)[inputs]: Use ‘icu4c-73’ instead of the promise.
Change-Id: I017e1416b70ecb94313aeb71aa4a0cafdfe0e9ab
Signed-off-by: Clément Lassieur <clement@lassieur.org>
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 27 | ||||
| -rw-r--r-- | gnu/packages/icu4c.scm | 22 | ||||
| -rw-r--r-- | gnu/packages/tor-browsers.scm | 3 |
3 files changed, 25 insertions, 27 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 5f77512427..094ff348e9 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -375,31 +375,6 @@ from collections.abc import MutableSequence")))) (list icu4c-69 readline zlib)))) -;; -;; Needed for IceCat 115. -;; -(define icu4c-73-promise - (delay - (package - (inherit icu4c) - (version "73.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/unicode-org/icu/releases/download/release-" - (string-map (lambda (x) (if (char=? x #\.) #\- x)) version) - "/icu4c-" - (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) - "-src.tgz")) - (sha256 - (base32 - "0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4")) - (patches - (cons - (search-patch - "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch") - (origin-patches (package-source icu4c))))))))) - ;;; ;;; Localization helper procedures. ;;; @@ -757,7 +732,7 @@ variable defined below. It requires guile-json to be installed." ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374). ffmpeg-5 libvpx - (force icu4c-73-promise) + icu4c-73 pixman pulseaudio mesa diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 5aaf3a8361..0dfe63b20a 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -109,6 +109,28 @@ C/C++ part.") (license x11) (home-page "http://site.icu-project.org/"))) +(define-public icu4c-73 + (package + (inherit icu4c) + (name "icu4c") + (version "73.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/unicode-org/icu/releases/download/release-" + (string-map (lambda (x) (if (char=? x #\.) #\- x)) version) + "/icu4c-" + (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) + "-src.tgz")) + (sha256 + (base32 + "0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4")) + (patches + (cons + (search-patch + "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch") + (origin-patches (package-source icu4c)))))))) + (define-public icu4c-70 (package (inherit icu4c) diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index c4ce997b99..ee5e072102 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -52,6 +52,7 @@ #:use-module (gnu packages golang) #:use-module (gnu packages gtk) #:use-module (gnu packages hunspell) + #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages kerberos) #:use-module (gnu packages libcanberra) @@ -270,7 +271,7 @@ Browser.") ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374). ffmpeg-5 libvpx - (force (@@ (gnu packages gnuzilla) icu4c-73-promise)) + icu4c-73 pixman pulseaudio mesa |