From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id gFXxLm2z7WMgdwAAbAwnHQ (envelope-from ) for ; Thu, 16 Feb 2023 05:39:09 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id yMkvL22z7WPu0AAA9RJhRA (envelope-from ) for ; Thu, 16 Feb 2023 05:39:09 +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 6C89239F1B for ; Thu, 16 Feb 2023 05:39:09 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pSW23-0005z9-9f; Wed, 15 Feb 2023 23:38:07 -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 1pSW20-0005yD-Nz for bug-guix@gnu.org; Wed, 15 Feb 2023 23:38:04 -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 1pSW20-0007gx-FP for bug-guix@gnu.org; Wed, 15 Feb 2023 23:38:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pSW20-0003OA-BJ for bug-guix@gnu.org; Wed, 15 Feb 2023 23:38:04 -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: Thu, 16 Feb 2023 04:38:04 +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.167652223012836 (code B ref 32026); Thu, 16 Feb 2023 04:38:04 +0000 Received: (at 32026) by debbugs.gnu.org; 16 Feb 2023 04:37:10 +0000 Received: from localhost ([127.0.0.1]:34579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW17-0003Kn-J8 for submit@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:10 -0500 Received: from mail-qt1-f177.google.com ([209.85.160.177]:33426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW15-0003K9-O9 for 32026@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:08 -0500 Received: by mail-qt1-f177.google.com with SMTP id h24so1080996qtr.0 for <32026@debbugs.gnu.org>; Wed, 15 Feb 2023 20:37:07 -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=q5cwY454VdKHPRD0Qrs6ygMt79t58feEXYmfyNSt/n/Dp4UO/xAIh4lo/5IB0DAkE/ K3N0urrFuGrf2cGtgHrQ0cCPQlPBcle9jNf6VNfn6WbarBeREctTdpWc9K0FXxe1oP96 o07TBJ7dVv9nIetFeodYKVAVKriUNG5VdzUyJMgRPCGp5VQWpEyr+zOUssfzXGdzZ2sQ 79qsgWhqXwqsTZfPZoD4dh7gv2ulhma73OX8naNDDPOTaEwWt8PQqxAtHStsNOXcdjkv 2+7xU5AmsQyjkuDtGCAlhlmbH2NRKC9sQpLauPJcTgChJXL0Kp85Ay0Gkzwum3944g7X bkcw== 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=5r4dxnEIXtxG8Nnv6T5YfN6RAPcLKBc15zbeyIwZEmMD2oaNd61Wc+33nD9Xwvzsvr JZLZftQ2aArfxMWt9N8h8sAVxI2znyvSuu4nZO2D1HBLA2d+qIgrychL6YG7wH5m35E7 X/q1LWpksNlTcbOSrgBGoa4oWIaOuJGH4LB53629tH2iYg00zxZrEKUO+qOOwMqotQ8j OqFcPlQOrkoS6Tr9VsHQEnzEkIXUkYWnldYVWT35iZHfn3v3RRQTdXMi9YvPKvadbOls MMPHGVNiaRVRNmcbMqn5IoBNQl3lEVHyrdmsL9Jf4pKW+rSXntiByElbT63/YwyQOKtz gbqw== X-Gm-Message-State: AO0yUKWV60ml5KpAcYtuzlFPksu2lrX4U8AUEc8ScUL7wvskDBL+1g1a umSexZ51e+1T/I+FOaad/JpwVY7pbC33e4Hd X-Google-Smtp-Source: AK7set9HMwaBjgpaytka1Cxsc20mKc8SA4hZF+h93t+0FdFOFPCDQ6mQnLUbd/FPaAlXRYiQNfAjUA== X-Received: by 2002:a05:622a:314:b0:3b8:429e:c6f5 with SMTP id q20-20020a05622a031400b003b8429ec6f5mr8076179qtw.30.1676522222108; Wed, 15 Feb 2023 20:37:02 -0800 (PST) Received: from localhost.localdomain (dsl-155-109.b2b2c.ca. [66.158.155.109]) by smtp.gmail.com with ESMTPSA id t85-20020a374658000000b007186c9e167esm452992qka.52.2023.02.15.20.37.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 20:37:01 -0800 (PST) From: Maxim Cournoyer Date: Wed, 15 Feb 2023 23:36:41 -0500 Message-Id: <20230216043649.32119-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230216043649.32119-1-maxim.cournoyer@gmail.com> References: <20230216043649.32119-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: 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676522349; a=rsa-sha256; cv=none; b=qtk58vH3ijhYFWfF7J2B+w+WmWiC6X1tsm6n/CQOkbVtnv5maEvEirO3skyxDfVl82ZJub Uhfb4LiF/zdQEt2MavsPfCPUy/atCdX54qvb0kP9q9g5rgl4v576yEwO1yf+CAZrncAU7I QhyhUQZ4Ci5wInYVjR9Rchz1EgZ8TzU830n63d03nWGn3lREE2FNxG/YBCRjjHaF20G5F+ 9ZGhQFDZ5XwQVvh4CDxiUhdk2uAe0QcrVeLTgQ4qwrZThpflrbO6oV585jvnaONZ84FNd1 vTFmmz6DFxctcZYspOrW7/JOlaES+o+WWj5SINn4ofgvX30XFABrJUcvR/dUKg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=q5cwY454; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1676522349; 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=nmw3sXQjyqxRnMLNkcdx560yXTE5etbYRw2blF8JTOdch+G9r70p2126HoBkeTNpx2v+6I CICABV+TOkQxwVJfULONkYzQoI/mR9p7DNqvoVuQ21USHGuAM85Ai7K67/vVllsCifaQKR cL5PffYDGjRLdVTlLKMifhU0rgw/evsgf04b4hMqzmGDejjh8oME1Do9ixPp+e9v/TWjLV s8lw3GfiirJ3WkaWWo2vIcPP2pyMyl4dJ0ZxmAgtTs+vr58vGQtsj/i5w0QnG3paopQV9B lyJNnt+b86+SHl5BwFP6ie/9WFi2/tcuGwtA1B1CBZKkkCndjr4NtiLcW55/qA== X-Migadu-Scanner: scn1.migadu.com X-Spam-Score: 1.48 X-Migadu-Queue-Id: 6C89239F1B X-Migadu-Spam-Score: 1.48 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=q5cwY454; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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" X-TUID: asRZ/wke7bec * 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