From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id MP/oFFjzcF/KDQAA0tVLHw (envelope-from ) for ; Sun, 27 Sep 2020 20:17:28 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id aHXQEFjzcF9BGQAAbx9fmQ (envelope-from ) for ; Sun, 27 Sep 2020 20:17:28 +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 15E2A940142 for ; Sun, 27 Sep 2020 20:17:28 +0000 (UTC) Received: from localhost ([::1]:43520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMd6t-0000IX-2r for larch@yhetil.org; Sun, 27 Sep 2020 16:17:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMd6k-0000ID-D0 for guix-devel@gnu.org; Sun, 27 Sep 2020 16:17:18 -0400 Received: from world.peace.net ([64.112.178.59]:47434) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMd6i-0004AZ-Iw for guix-devel@gnu.org; Sun, 27 Sep 2020 16:17:18 -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 1kMd6W-0000Zc-6Y; Sun, 27 Sep 2020 16:17:04 -0400 From: Mark H Weaver To: Zhu Zihao Subject: Re: IceCat-78.2 preview on 'wip-icecat-78' branch; need icedove-78. In-Reply-To: <570e8897.5f51.174d016ecc2.Coremail.all_but_last@163.com> References: <570e8897.5f51.174d016ecc2.Coremail.all_but_last@163.com> Date: Sun, 27 Sep 2020 16:15:42 -0400 Message-ID: <87y2kv6kmu.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=64.112.178.59; envelope-from=mhw@netris.org; helo=world.peace.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/27 16:17:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: guix-devel@gnu.org Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: TRSsejoUXy0c Hi, "Zhu Zihao" writes: > @@ -1017,10 +1010,31 @@ from forcing GEXP-PROMISE." > (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$")) [...] > Why we need another `find-files` in `substitute*`? The outer > `find-files` should find all locks file for you, maybe you can use the > arg of lambda instead. Indeed, that's clearly what I had intended to do, but then I apparently forgot a step. Good catch, thanks! > @@ -756,8 +750,8 @@ from forcing GEXP-PROMISE." > ("libxt" ,libxt) > ("libffi" ,libffi) > ("ffmpeg" ,ffmpeg) > - ("libvpx" ,libvpx) > - ("icu4c" ,icu4c) > + ;; UNBUNDLE-ME! ("libvpx" ,libvpx) > + ;; UNBUNDLE-ME! ("icu4c" ,icu4c) > ("pixman" ,pixman) > ("pulseaudio" ,pulseaudio) > ("mesa" ,mesa) > > IceCat 78 may need icu4c v67, which variable name is `icu4c-67` in > guix channel. Good idea! Would you like to propose a patch, test it, and report back? If not, I'll try it eventually. I would certainly be very glad to reduce the number of bundled libraries in our IceCat package, which seems to be getting worse over time. Any help on that effort would be much appreciated. Best, Mark