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 OHS2H6Tq6mN4OAAAbAwnHQ (envelope-from ) for ; Tue, 14 Feb 2023 02:57:56 +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 kMWtH6Tq6mOYLgAA9RJhRA (envelope-from ) for ; Tue, 14 Feb 2023 02:57:56 +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 42B6A17060 for ; Tue, 14 Feb 2023 02:57:56 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=JGiQUJCF; 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=1676339876; 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=Ypa9TCbbUvyEF/Ux7404e89FnVfkmrnBcv9kAhRbFDc=; b=CiXady8hXXDbxqR127gvSTwtuhcxNyFbF8wNxA/4EsC2AkqV1p5BnvuAio3OAaab5yCVLr Gjb0xHy9uSAQ2DX1Shop0VzY84Vj79BOMk5g2MbwuWlKdsHmzJCpXtT6uWvHQnBHlmrEvr n/TgDmQhloKTuiGcT/IGtkxIvtWrXrmhUZtGcKZtYuRFZg7/7gpd/0fC46DGItFx2rfiJR ETuVb9xJljifoXkZ2npJE2DgjJNW3K9/v6b1XsH8HLbCkuLqx++IwgVQV5l3Oo7M7qEhpM UCVFT6U0XuVHd4zjppsjXUWKwQUcdG4443w/Gb2xLO8LWavzNZKa3s0Cn0TC/w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=JGiQUJCF; 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=1676339876; a=rsa-sha256; cv=none; b=ohBsJFdxrCrpV6lMzDf1t2XKTvloXahlPBq0RPBc1/+9eYy8cPctFyHKnIHaJfM1I7UtJd 2QWDdSE1JVxLuLKs1WUpyiEb+xcVo+Vx/b+xqbQLBJAqzgnMqfB18SpqMCyOwxQ1yrSdFF 8JF97bI2srzXkt1C5qkCJnSTYSeoJp8PDnH8CBbkj4SJ5LgKAXehK5FqJiGy6bhGWRlWgk mhMYopOtmmcXvWNYQd2JA7KpS3O/3+RGn1AEicfPXnfzWqctmv/7aVRjCIYZgit4kFmkzr nvxyrxn8f9x9DQiku85dUspXd6LHeXDTf8+Lea2pJdDvp17DYXCM01kLDxK73g== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRkZG-0002Ac-QD; Mon, 13 Feb 2023 20:57:14 -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 1pRkZC-00025w-0J for bug-guix@gnu.org; Mon, 13 Feb 2023 20:57:10 -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 1pRkZ5-0003Bz-AN for bug-guix@gnu.org; Mon, 13 Feb 2023 20:57:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pRkZ5-0007Xm-6A for bug-guix@gnu.org; Mon, 13 Feb 2023 20:57:03 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 03/10] 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: Tue, 14 Feb 2023 01:57: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.167633979328863 (code B ref 32026); Tue, 14 Feb 2023 01:57:03 +0000 Received: (at 32026) by debbugs.gnu.org; 14 Feb 2023 01:56:33 +0000 Received: from localhost ([127.0.0.1]:52056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYZ-0007VG-L3 for submit@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:33 -0500 Received: from mail-qt1-f177.google.com ([209.85.160.177]:35511) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRkYV-0007UK-BT for 32026@debbugs.gnu.org; Mon, 13 Feb 2023 20:56:27 -0500 Received: by mail-qt1-f177.google.com with SMTP id q13so16111064qtx.2 for <32026@debbugs.gnu.org>; Mon, 13 Feb 2023 17:56:27 -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=Ypa9TCbbUvyEF/Ux7404e89FnVfkmrnBcv9kAhRbFDc=; b=JGiQUJCFD5Amdgrk5R18qM21qVWq0co5gWCJkK2efoFYXXrgs/q3e9hvPhM5bWREOx HH8RRxDfjb/r4l4CNvh8XzSip8pnQScWHLPQ1zaSUn/QxMi7TFlV/73m3uPxvatbExNu Xm53y50S+e+DrGkK3/98KnOp7HwMpxfKNocAQCHr/9scgODgWj7kvV7zMYHqETfRtdga Oga/x5GFLgs171Uqt1DSt3xyAV+G6VD9E/ZoCyzCETeaWo0hTsg3MIV0be6XD10yepoQ 9C0yJXrjEjoRB5Uq6EdXQJmsT1TFp7BM1OlWtstuBdy0q4KhRtVHTTrFkfTQoPcF8cl6 4IoQ== 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=Ypa9TCbbUvyEF/Ux7404e89FnVfkmrnBcv9kAhRbFDc=; b=hpqm6jE3M0/g+f6fJmrzEhXJO8D+AoAj5VTrl9B4QYI0IiGsVsHroxp272Sa9dHRYO 2fwOuAKtljypK1t6Ixj/vTtrZf+Vd4B/QQi6SbjmT5PMGu71z08slJ91MDZwppCa7yNH BYtrRjuexAx5jIQAzK5m/q7ETSGb6OlxWPQ4nJW3V2jjA6os3sFwdCTcsP+dtt1hATu2 gQ7drVQfgtC2dVPvDMEoc3dhKPAXMsyZ24awtDhPhsPG+3KUi3GGkKhQOLwOLUGhESMy YCOQJETcrgboba78vyCb8NWjl/GSSKcVZoN/VxU2FYq4gC5AXLPX/GecvpECIRS7IsE8 IUPQ== X-Gm-Message-State: AO0yUKU2cALAXVWj9EMh4pzLGc+6Hc7SL5vfsAXF8qeoWhoaQ0Gsw6dM CQq6vqesf8oONo4ykLUo4RADXRVrGdYTe8sR X-Google-Smtp-Source: AK7set+V0P/Wg3rTFkoAW5REwmZCGX8gWCAaGWzy4306huVmM23KIuOeJoocig+gq9lMOU7Pvc+l/w== X-Received: by 2002:a05:622a:1896:b0:3b9:a4cf:313f with SMTP id v22-20020a05622a189600b003b9a4cf313fmr938690qtc.29.1676339781780; Mon, 13 Feb 2023 17:56:21 -0800 (PST) Received: from localhost.localdomain (dsl-10-133-137.b2b2c.ca. [72.10.133.137]) by smtp.gmail.com with ESMTPSA id p205-20020a3742d6000000b0072a375c291csm10948798qka.30.2023.02.13.17.56.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 17:56:21 -0800 (PST) From: Maxim Cournoyer Date: Mon, 13 Feb 2023 20:55:48 -0500 Message-Id: <20230214015555.8643-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230214015555.8643-1-maxim.cournoyer@gmail.com> References: <20230214015555.8643-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: X-Migadu-Queue-Id: 42B6A17060 X-Spam-Score: 6.78 X-Migadu-Spam-Score: 6.78 X-Migadu-Scanner: scn0.migadu.com List-Post: 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-Country: US X-Migadu-Flow: FLOW_IN X-TUID: Wyo5sKOGgx/+ * 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. --- 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 8be41c2832..8f18c50dde 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.7.0-guix0-preview1") +(define %icecat-base-version "102.7.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 "20230117000000") ;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 + "1ahl66x8chnsz80capqa5ivyrqhc50s91zrcgz1jxd7w2ws61957")))) + ;; '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 - "1ahl66x8chnsz80capqa5ivyrqhc50s91zrcgz1jxd7w2ws61957")))) - + (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.7.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) (gnuzilla-commit "7f76da3cfd5d04fa38d894f6ea6ac5f2fd0ea837") @@ -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