diff options
| author | Marius Bakke <marius@gnu.org> | 2020-10-19 00:17:48 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-10-19 00:17:48 +0200 |
| commit | 1a8f7a0f584e5dd6e8f1a379b92f689b71902295 (patch) | |
| tree | 8586450fc3068b217e60a7e942fa4c7d89ad74e7 /gnu/packages/gnuzilla.scm | |
| parent | 19d42e0e23a7f90ac2dcc1c279bd23a967ff0314 (diff) | |
| parent | 2a4f3c1711fdb947e615b5a89e285421b3bf0925 (diff) | |
| download | guix-1a8f7a0f584e5dd6e8f1a379b92f689b71902295.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 60ea610908..06b00038bd 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> @@ -591,10 +591,14 @@ from forcing GEXP-PROMISE." (base32 "0266gp8vs4avlfdnr8dj7b47msxv1vkd0xpnifp04v4scvgj0yaj")))) + ;; 'search-patch' returns either a valid file name or #f, so wrap it + ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. (gnuzilla-fixes-patch - (local-file (search-patch "icecat-use-older-reveal-hidden-html.patch"))) + (local-file (assume-valid-file-name + (search-patch "icecat-use-older-reveal-hidden-html.patch")))) (makeicecat-patch - (local-file (search-patch "icecat-makeicecat.patch")))) + (local-file (assume-valid-file-name + (search-patch "icecat-makeicecat.patch"))))) (origin (method computed-origin-method) @@ -1157,11 +1161,11 @@ standards of the IceCat project.") (cpe-version . ,(first (string-split version #\-))))))) ;; Update this together with icecat! -(define %icedove-build-id "20200926000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-build-id "20201007000000") ;must be of the form YYYYMMDDhhmmss (define-public icedove (package (name "icedove") - (version "78.3.1") + (version "78.3.2") (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) @@ -1441,7 +1445,7 @@ standards of the IceCat project.") ;; in the Thunderbird release tarball. We don't use the release ;; tarball because it duplicates the Icecat sources and only adds the ;; "comm" directory, which is provided by this repository. - ,(let ((changeset "00912779d73faef4277c57fe99aa5259b11d244d")) + ,(let ((changeset "6ee0e0ff64f4ccda9c478426d0b5d15cd583f8e6")) (origin (method hg-fetch) (uri (hg-reference @@ -1450,7 +1454,7 @@ standards of the IceCat project.") (file-name (string-append "thunderbird-" version "-checkout")) (sha256 (base32 - "12isvk6q8miwn81kimrgcmjh4vsmdbbx93q9pafgxlx3p92s5v8h"))))) + "0w8p35x53g5anck69xnpn688600n2pyx9c7y640szl1ssdsgch82"))))) ("autoconf" ,autoconf-2.13) ("cargo" ,rust-1.41 "cargo") ("clang" ,clang) |