all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Mark H Weaver <mhw@netris.org>
To: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Cc: 43647@debbugs.gnu.org
Subject: [bug#43647] [PATCH 2/3] gnu: icedove: Update to 78.3.0.
Date: Sun, 27 Sep 2020 19:25:11 -0400	[thread overview]
Message-ID: <87mu1a7qfh.fsf@netris.org> (raw)
In-Reply-To: <20200927104420.4091-2-jonathan.brielmaier@web.de>

Hi Jonathan,

> * gnu/packages/gnuzilla.scm (icedove): Update to 78.3.0.
> [source]: Use source from Icecat 78.
> [arguments]: Use more flexible approach for generating cargo checksums
> from icecat. Update files in 'rename-to-icedove phase. Remove gone
> configure flags and rename `--disable-ion` to `--disable-jit`.
> [inputs]: Update icu4c to version 67 and nss to 3.56.
> [native-inputs]: Use ESR 78 mercurial repo for thunderbird soruces.
> Update rust and cargo to 1.41, rust-cbindgen to 0.14 and
> node to 10.22.
> 
> Tested-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>

Thanks very much for this, Jonathan!

It looks good to me except for one minor issue which is my fault:

> diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
> index 85ad9678d0..873cccaa9c 100644
> --- a/gnu/packages/gnuzilla.scm
> +++ b/gnu/packages/gnuzilla.scm
[...]
>             (lambda _
>               (use-modules (guix build cargo-utils))
>               (let ((null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))
> -               (substitute* '("Cargo.lock" "gfx/wr/Cargo.lock")
> -                 (("(\"checksum .* = )\".*\"" all name)
> -                  (string-append name "\"" null-hash "\"")))
> -               (generate-all-checksums "third_party/rust"))
> +               (for-each (lambda (file)
> +                           (format #t "patching checksums in ~a~%" file)
> +                           (substitute* (find-files "." "Cargo.lock$")
> +                             (("^checksum = \".*\"")
> +                              (string-append "checksum = \"" null-hash "\""))))
> +                         (find-files "." "Cargo.lock$"))
> +               (for-each generate-all-checksums
> +                         '("third_party/rust"
> +                           "toolkit/library/rust")))
>               #t))

This change was inherited from a change I made in the IceCat 78 update
(commit c7011ff850420fdbe1319b3d218bd362f2f9d618), and as Zhu Zihao
<all_but_last@163.com> recently pointed out on guix-devel, it has a
problem which turns out to be harmless but wasteful: the argument to the
second call to 'substitute*' should be 'files' instead of
(find-files "." "Cargo.lock$").

I'm currently testing the 'icedove' build with this minor fix applied.

     Thank you!
        Mark




  reply	other threads:[~2020-09-27 23:27 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-27 10:41 [bug#43647] [PATCH 0/3] Update icedove to 78 Jonathan Brielmaier
2020-09-27 10:44 ` [bug#43647] [PATCH 1/3] gnu: Add nss@3.56 Jonathan Brielmaier
2020-09-27 10:44   ` [bug#43647] [PATCH 2/3] gnu: icedove: Update to 78.3.0 Jonathan Brielmaier
2020-09-27 23:25     ` Mark H Weaver [this message]
2020-09-28  9:41       ` Jonathan Brielmaier
2020-09-27 10:44   ` [bug#43647] [PATCH 3/3] gnu: Remove icecat-68 signs Jonathan Brielmaier
2020-09-27 23:33     ` Mark H Weaver
2020-09-28  9:42       ` Jonathan Brielmaier
2020-09-28 18:56 ` bug#43647: [PATCH 0/3] Update icedove to 78 Mark H Weaver

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87mu1a7qfh.fsf@netris.org \
    --to=mhw@netris.org \
    --cc=43647@debbugs.gnu.org \
    --cc=jonathan.brielmaier@web.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.