diff options
| author | Mark H Weaver <mhw@netris.org> | 2019-10-30 03:11:25 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2019-10-31 16:34:09 -0400 |
| commit | 9b096517bc8de415a8c737e10915a19b0756104a (patch) | |
| tree | c9a2e32214f356e527f74643d63db9223fc9ef42 /gnu/packages/gnuzilla.scm | |
| parent | bbad38f4d8e6b6ecc15c476b973094cdf96cdeae (diff) | |
| download | guix-9b096517bc8de415a8c737e10915a19b0756104a.tar.gz | |
gnu: icecat: Update to 68.2.0-guix0-preview3.
* gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update to the latest upstream commit on '68' branch. * gnu/packages/patches/icecat-gnuzilla-fixes.patch: Remove changes that have been incorporated upstream, and add new pending changes, notably the addition of several IceCat-specific preferences. * gnu/packages/patches/icecat-makeicecat.patch: Adapt to changes in icecat-gnuzilla-fixes.patch.
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 16d3fe5db9..fa8086671f 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -550,8 +550,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "68.2.0-guix0-preview2") -(define %icecat-build-id "20191028000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "68.2.0-guix0-preview3") +(define %icecat-build-id "20191031000000") ;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' @@ -575,19 +575,21 @@ from forcing GEXP-PROMISE." (base32 "0f3gf5gwhxabm6xs29nlxmfqdw3fs7v458vq1fydrglfyvmc5wc5")))) - (upstream-icecat-base-version "68.1.0") ; maybe older than base-version + (upstream-icecat-base-version "68.2.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "aa7ab9483a64c43e77736917dd83841ccc437300") + (gnuzilla-commit "930298e1efff3e40721659d8fd7118cdd2477bd4") (gnuzilla-source (origin (method git-fetch) (uri (git-reference (url "git://git.savannah.gnu.org/gnuzilla.git") (commit gnuzilla-commit))) - (file-name (git-file-name "gnuzilla" upstream-icecat-base-version)) + (file-name (git-file-name "gnuzilla" + ;;upstream-icecat-base-version + (string-take gnuzilla-commit 8))) (sha256 (base32 - "03jygq1zna621y0ba6370cff4v2g9l57g3015y3vxbahnmzn9msa")))) + "14g57b0262qq5s0w8b1lrk8wkvg7m068dfi0ilvhg2q5jrxk3cd0")))) (gnuzilla-fixes-patch (local-file (search-patch "icecat-gnuzilla-fixes.patch"))) |