From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id kB6WJM4fcV/UVgAA0tVLHw (envelope-from ) for ; Sun, 27 Sep 2020 23:27:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id YECAIM4fcV9dKAAAB5/wlQ (envelope-from ) for ; Sun, 27 Sep 2020 23:27:10 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3B3809402B1 for ; Sun, 27 Sep 2020 23:27:10 +0000 (UTC) Received: from localhost ([::1]:33746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMg4T-0007YX-6W for larch@yhetil.org; Sun, 27 Sep 2020 19:27:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMg4M-0007Y7-IF for guix-patches@gnu.org; Sun, 27 Sep 2020 19:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39121) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kMg4M-0007zz-9M for guix-patches@gnu.org; Sun, 27 Sep 2020 19:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kMg4M-0003Us-6b for guix-patches@gnu.org; Sun, 27 Sep 2020 19:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43647] [PATCH 2/3] gnu: icedove: Update to 78.3.0. Resent-From: Mark H Weaver Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Sep 2020 23:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43647 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jonathan Brielmaier Cc: 43647@debbugs.gnu.org Received: via spool by 43647-submit@debbugs.gnu.org id=B43647.160124920013410 (code B ref 43647); Sun, 27 Sep 2020 23:27:02 +0000 Received: (at 43647) by debbugs.gnu.org; 27 Sep 2020 23:26:40 +0000 Received: from localhost ([127.0.0.1]:50667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMg40-0003UD-EN for submit@debbugs.gnu.org; Sun, 27 Sep 2020 19:26:40 -0400 Received: from world.peace.net ([64.112.178.59]:58080) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMg3y-0003Tz-TH for 43647@debbugs.gnu.org; Sun, 27 Sep 2020 19:26:39 -0400 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kMg3s-0002iz-RB; Sun, 27 Sep 2020 19:26:32 -0400 From: Mark H Weaver In-Reply-To: <20200927104420.4091-2-jonathan.brielmaier@web.de> References: <20200927104111.2522-1-jonathan.brielmaier@web.de> <20200927104420.4091-1-jonathan.brielmaier@web.de> <20200927104420.4091-2-jonathan.brielmaier@web.de> Date: Sun, 27 Sep 2020 19:25:11 -0400 Message-ID: <87mu1a7qfh.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: r6zq4YIvuJ/G 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 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 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