From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id eOXeHYZ572MNmwAAbAwnHQ (envelope-from ) for ; Fri, 17 Feb 2023 13:56:38 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id SOD1HYZ572NX1gAA9RJhRA (envelope-from ) for ; Fri, 17 Feb 2023 13:56:38 +0100 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 0023D10BBE for ; Fri, 17 Feb 2023 13:56:37 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="YK/mtGcf"; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676638598; a=rsa-sha256; cv=none; b=Y8rYTsTAMOnkDzLRQaU4OPF48feYRFgHyUujAe8158VK3GkIcvUgrPTaAfCsg3joQohSTP YHQJGm3uXoYvJq9aquhlsYB8rIqAlpftATggaNfyj4gNJQ5Pc9Vp7fj9MYv1doRqKHI0ve dpOcsLWnU6S6Jr9mH0mV1LyaPJ4qWGvErx6VmRZmZ2/eJgrrHfcLlIb/Vl8Jzodyrs273J FnFDvHkJoFJGYaJ4r0ZCzewMMbL7zvGzhsV60kVPK6CjHjrybGkDmTfckLXif9cF2WVUsS ggj3yjAV68Ks936cNR08auAAha508uQmBA/pRmkgRZY4nEuFco8fntfjLPaNDA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="YK/mtGcf"; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1676638598; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=csZZWbIIG6nivsnOnivxKMYKBMEZJ8NrVSmye9r+48g=; b=kQrikbI3Fh2sHzLm7K+N50D6zE1eENNhbd6XiyAL2WTMqA6Q5Z0LyPeFxiorJLAF3UXOJC ss1EgsclUNyEa6u6B8p1JzkvxtIEmeZeNWKo/3liQpK8d70hwsVdawXAenok8oI7XV/WvF AUAzeJv5vpG0ecnTFdBf5d5vhZIv/KaATQe6B5qUVdWl1UNa19WR8XOS5Ze6N+WfeM7L+6 BZMQd5u8Xoc5b8sT7c6oVkplY4qiUxPEwGN+kJu6q5wiYYpKcfejgWf9K3pRocY17EKkJc JONSeA2cAV6ereKYsppMlKtUWVGmZ6zMKFZfohOmUphrm+szwVOOEXNOoZxMXw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pT0Hf-00025M-Ql; Fri, 17 Feb 2023 07:56:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pT0HU-0001si-1Q for bug-guix@gnu.org; Fri, 17 Feb 2023 07:56:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pT0HT-0007eS-NW for bug-guix@gnu.org; Fri, 17 Feb 2023 07:56:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pT0HT-0001qI-K5 for bug-guix@gnu.org; Fri, 17 Feb 2023 07:56:03 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v3 03/11] gnu: Define UPSTREAM-FIREFOX-SOURCE at the top level. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 17 Feb 2023 12:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32026 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 32026@debbugs.gnu.org Cc: mhw@netris.org, ludo@gnu.org, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.16766385627054 (code B ref 32026); Fri, 17 Feb 2023 12:56:03 +0000 Received: (at 32026) by debbugs.gnu.org; 17 Feb 2023 12:56:02 +0000 Received: from localhost ([127.0.0.1]:38770 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HR-0001pV-Ir for submit@debbugs.gnu.org; Fri, 17 Feb 2023 07:56:02 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:45029) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT0HN-0001oY-6c for 32026@debbugs.gnu.org; Fri, 17 Feb 2023 07:55:57 -0500 Received: by mail-qt1-f169.google.com with SMTP id s22so759339qtw.11 for <32026@debbugs.gnu.org>; Fri, 17 Feb 2023 04:55:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=csZZWbIIG6nivsnOnivxKMYKBMEZJ8NrVSmye9r+48g=; b=YK/mtGcf/1CRUev8x1cIN2NHx1LZLkRNbrObOPW+f2D4/pb3829d4uEqG1Abq3/hYZ KpzcvhA+DPelfL2FA0t1BXVyxy0eOFVBOZC6H4vEF9wzA/T4l8MT2YKGuSXyywsW9HX9 pkfEfO08tiJpU9GkL8mmNhCn1oCVzj9M51S8pVHS2YASPN8kv/cvmSGFdNyDfJnmz5Z7 I7A5CV7EMZUwtLTJ9uzuAXKa8j6ZxHR2IbDAfBcmWciiFTGwCV/SexChjx14UQpk7sCc nft5n96dl1efKDiohW3bhChsqw/dJdcrIzvKsm9Lee9G87sNl/C0cTlQkcWnvVGVsj3G QukA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=csZZWbIIG6nivsnOnivxKMYKBMEZJ8NrVSmye9r+48g=; b=XSwhjGRHgR1HN0tvpXFQXxGl73BqCB4idBN4Pp5hwFrMmQizfEirti5Jlp1B7FNhLC U9wCk3Ol0wO6zsKbV73QjL39XFZEo7fTpHreXM5XqVG/Iq/4FDrFx2AHU0+BP0kSk+jG psEfu2tyruFx5Kws5aHy1xcVZ3sN4jofogCzGQrSl3CTaV7AlSpU5JI2cdi0LfX4r8eD 7+FyhwDTtMmySOdgC0Ei80uFi25Q1CjmLIdaJ88bDVWMhp/y8XtTGd8VZGEQ1HzFPthu MGI3dGIiFjc6XVCZ+kSk6iJnXEBPHfhEP2MsOjzfeY+yXJr6dQEHPACIykIUVxxAgb77 t2Og== X-Gm-Message-State: AO0yUKXsRHSZfWtoojhv6ajPYR6F6dzcXQZQCzCwykitCrFw315F5PX7 fyFLznVP4gTGAgplxQ6Sq9Rt4RqqsMT2rkY3 X-Google-Smtp-Source: AK7set8Cm8g8tjL+QGnUiNwcGr0ZPOuQfx1CYt4c/p4EFplgMfDNRVeDCp0g+jiOgAHXRxxnNk77Xg== X-Received: by 2002:ac8:5811:0:b0:3b8:6b57:499e with SMTP id g17-20020ac85811000000b003b86b57499emr1566698qtg.36.1676638551267; Fri, 17 Feb 2023 04:55:51 -0800 (PST) Received: from localhost.localdomain (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id f17-20020ac80691000000b003b9b48cdbe8sm3176026qth.58.2023.02.17.04.55.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 04:55:50 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 07:55:30 -0500 Message-Id: <20230217125539.24467-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217125539.24467-1-maxim.cournoyer@gmail.com> References: <20230217125539.24467-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: X-Migadu-Queue-Id: 0023D10BBE X-Spam-Score: -0.03 X-Migadu-Spam-Score: -0.03 X-Migadu-Scanner: scn0.migadu.com List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-TUID: utMIcc1VASuJ * gnu/packages/gnuzilla.scm (%icecat-base-version): New variable. (%upstream-firefox-version): Likewise. (%icecat-version): Define in terms of %icecat-base-version. (upstream-firefox-source): New variable. (icecat-source): Adjust to use the above newly introduced variables. --- (no changes since v1) gnu/packages/gnuzilla.scm | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 1ed52c68e9..1bafa92377 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -505,31 +505,29 @@ (define all-mozilla-locales ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-version "102.8.0-guix0-preview1") +(define %icecat-base-version "102.8.0") +(define %upstream-firefox-version (string-append %icecat-base-version "esr")) +(define %icecat-version (string-append %icecat-base-version "-guix0-preview1")) (define %icecat-build-id "20230214000000") ;must be of the form YYYYMMDDhhmmss +(define upstream-firefox-source + (origin + (method url-fetch) + (uri (string-append + "https://ftp.mozilla.org/pub/firefox/releases/" + %upstream-firefox-version "/source/" + "firefox-" %upstream-firefox-version ".source.tar.xz")) + (sha256 + (base32 + "0j6afrgfsmd0adbbmffw4p1f2hznpck9d36z3bsjx36f7cjgdy27")))) + ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' ;; script from the upstream IceCat project. (define icecat-source - (let* ((base-version (first (string-split %icecat-version #\-))) - - (major-version (first (string-split base-version #\.))) - (minor-version (second (string-split base-version #\.))) - (sub-version (third (string-split base-version #\.))) - - (upstream-firefox-version (string-append base-version "esr")) - (upstream-firefox-source - (origin - (method url-fetch) - (uri (string-append - "https://ftp.mozilla.org/pub/firefox/releases/" - upstream-firefox-version "/source/" - "firefox-" upstream-firefox-version ".source.tar.xz")) - (sha256 - (base32 - "0j6afrgfsmd0adbbmffw4p1f2hznpck9d36z3bsjx36f7cjgdy27")))) - + (let* ((major-version (first (string-split %icecat-base-version #\.))) + (minor-version (second (string-split %icecat-base-version #\.))) + (sub-version (third (string-split %icecat-base-version #\.))) (upstream-icecat-base-version "102.8.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) (gnuzilla-commit "03d9e3db5affe21db077c410ec08c313d6aa280e") @@ -562,7 +560,7 @@ (define icecat-source #~(begin (use-modules (guix build utils)) (let ((firefox-dir - (string-append "firefox-" #$base-version)) + (string-append "firefox-" #$%icecat-base-version)) (icecat-dir (string-append "icecat-" #$%icecat-version))) -- 2.39.1