diff options
author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-02-25 10:28:03 +0100 |
---|---|---|
committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-02-25 10:28:03 +0100 |
commit | 7bf4ce4582cd2f9c5b30c547262c1c4a426c0b9b (patch) | |
tree | c6f9cc83feaaf685b7542a98e60bc24ea7c297b1 /gnu/packages/gnuzilla.scm | |
parent | 06d01c610e3bee61e38a177aecda5982d5b338ae (diff) | |
parent | 92d8b4c9598ed32cdb6630433d5914c1ae8b7146 (diff) |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
-rw-r--r-- | gnu/packages/gnuzilla.scm | 39 |
1 files changed, 7 insertions, 32 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 83d41c540d..a60fd8717e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -376,31 +376,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. ;;; @@ -548,9 +523,9 @@ variable defined below. It requires guile-json to be installed." ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-base-version "115.7.0") +(define %icecat-base-version "115.8.0") (define %icecat-version (string-append %icecat-base-version "-guix0-preview1")) -(define %icecat-build-id "20240123000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-build-id "20240220000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -570,12 +545,12 @@ variable defined below. It requires guile-json to be installed." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0ad4az0hiq7q9pnya1pyj75a732ag5bd4jp8mxg4izz97k6zzv8k")))) + "1slmp2v1q3my81z8kiym9rpxw5d9n4sn07v7hv99517w7vr8d05g")))) ;; The upstream-icecat-base-version may be older than the ;; %icecat-base-version. - (upstream-icecat-base-version "115.7.0") - (gnuzilla-commit "dbe6da400cf4f28e5e893d0acb5022e23cf3afcf") + (upstream-icecat-base-version "115.8.0") + (gnuzilla-commit "7e2ff1ad7e03d2bfe0b2daf3f25961b06cab8848") (gnuzilla-source (origin (method git-fetch) @@ -587,7 +562,7 @@ variable defined below. It requires guile-json to be installed." (string-take gnuzilla-commit 8))) (sha256 (base32 - "0j7wxiyqqwn8slr4cjwqya9jh912l0xjprld5hj79an0vnb7c21h")))) + "1lv3vfqv0zb634gnvzb37fs04rb1jlrd2n1k51yjsvdznpqfpi1y")))) ;; 'search-patch' returns either a valid file name or #f, so wrap it ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. @@ -758,7 +733,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 |