From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 YHNSByt48mPjSAAAbAwnHQ (envelope-from ) for ; Sun, 19 Feb 2023 20:27:39 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id QHhfBit48mMqTgEAG6o9tA (envelope-from ) for ; Sun, 19 Feb 2023 20:27:39 +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 3E84EFD4F for ; Sun, 19 Feb 2023 20:27:38 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=ZQyXvulH; 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=1676834858; a=rsa-sha256; cv=none; b=IS99EoROcdYex9lIj5U8BNq5COOibLrKBsLb7MsLjyBDC5Kv8voRBRKrh0TePJONZjSS0o IwcuGsG7p7HVKYJfctrBawKXAEkoZL8MSfOM17y8vpFqJ9ZRqb4Rkb+3VAzlFugGWxfOxN rvkoekZvu43n1N+PoZe1530NGXVptntsYubD+5Y4+W9oX0fuRyctokb/16ukbh0/Y5Vr8c TbwjjbjwTiVMeqN5BbHkFyuu/uLWOGuRtiXtXibyea62aD8X4p58lthP7NdWJAqB5A/i9U cIMWl7buoJiK7ZjiFcgU+5qDNxumHDPz+jhskqKyogXYu78EpEuAEwGwMYfBVA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=ZQyXvulH; 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=1676834858; 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=3QATiJyFuYViGubtWES8psclHffej/qOhXpCNQE0DMY=; b=NbbrVb3jE1otHi/jRKCnRQgJpnhN3MSYqhEjNXKlGAKR1yzWeW1WHfNsz8ieNsSo4GbuzA 7RROm9cbMAFHf9nXn58w67YW0VVPsBrLTDOWKimeKR5x8Mjl2w+49Z44Mq8lruXN6Deufx Aj+zn4E5QO7zpk4ABI42mm9Qaspd0u3kZf2YpTCS5jH0/ruqlFhe2ur7ciE9xoQgfLgg/j 7wBkNAVQYLlj+4liMxKpJZEBOQ3TVSYBEQAqGQSWzNQ+tjb0pp8nEgOERglK9qcQcueiIT O2mGQMHa9RPz5lBOmrnWIRSGxVC4GsoMI9BJdhZFZAVkqMkSD+d2AInFbm3BTw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pTpJz-0005qT-Mc; Sun, 19 Feb 2023 14:26:03 -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 1pTpJy-0005oW-GS for bug-guix@gnu.org; Sun, 19 Feb 2023 14:26:02 -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 1pTpJy-0007ED-7S for bug-guix@gnu.org; Sun, 19 Feb 2023 14:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pTpJy-0000qS-3F for bug-guix@gnu.org; Sun, 19 Feb 2023 14:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH v4 3/9] gnu: Define %icecat-base-version at the top level. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 19 Feb 2023 19:26:02 +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.16768347143097 (code B ref 32026); Sun, 19 Feb 2023 19:26:02 +0000 Received: (at 32026) by debbugs.gnu.org; 19 Feb 2023 19:25:14 +0000 Received: from localhost ([127.0.0.1]:49690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpJB-0000nt-ND for submit@debbugs.gnu.org; Sun, 19 Feb 2023 14:25:14 -0500 Received: from mail-qt1-f182.google.com ([209.85.160.182]:45689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTpJ9-0000nR-LS for 32026@debbugs.gnu.org; Sun, 19 Feb 2023 14:25:12 -0500 Received: by mail-qt1-f182.google.com with SMTP id t10so692264qto.12 for <32026@debbugs.gnu.org>; Sun, 19 Feb 2023 11:25:11 -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=3QATiJyFuYViGubtWES8psclHffej/qOhXpCNQE0DMY=; b=ZQyXvulHvP+5sut4cTl8HrzZG+5y+5kkEVy3ohgTeldXBmvDRdcA1i88AokgN3Wh6c kXnujhfs9AUQem2S9x+EfHNK5V2vcDaOryFID+J0+55uF0UIvm6GOArS3CDWOL4lAkW5 b9pkodJ5Mx9TaXXiy9Ngwl4dYzOfz1BBsPeSVCL5pCJ4abSuSUsmUGufZ6VoY/EFaYFs j1AuOUntkPVU2We2DNYaC3rV2gZAF8nU+y21ryq7afaCS6xBIlsE5NmI8f8FziaQ71MO tMjHDzLzVA/Jggug0PpGJLTi7mStE/YLCPoSMOYY3EBW2d1ET0YrWkXjip667/zd2Qvn LH9w== 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=3QATiJyFuYViGubtWES8psclHffej/qOhXpCNQE0DMY=; b=54xKDYBqQ1S1BurcpKBiqZRvY1nuM2gXbQ9gQgPSIRD0nDwPXnFXQTzesesI6pSq3O tNStXctzfdlYCeDBbAz6mqT8mSGeBzmE6lraQ8lso2dYSALYw9MTweMozdVxE06HJxXn ZKxpM66dMhzO1I2ctxYscLtokieRW+x7Hj1LtohBVqiyBG4Nq+2Eg1wUmMZFjq3Og78M GtcrOOmcLWrZ1mbQUt1ol/WHZM1HdUeb1hgesACP4CKTRrLn0js4KJzvaD9S4m3beGNe WDkNsuLmslRz1H9iYwExSKxEHbbgXaUlOT5qTdZO2nUNz0E/HmzgV+/u0BVBTZ40dtsn 0lhA== X-Gm-Message-State: AO0yUKVeIs2ErMvwBOBBZOBbfHxmLTNgkYlimFf5f71Zd1TZR+QAK1zv HuJllqmr1EjtOmoUmlDriTAmPhu6RTCBUQ== X-Google-Smtp-Source: AK7set+j3JteSQgPj5zPhf9N5nP4eL8PjKU/m+pHJjCTPq/06xxmF/Vlc+EtD3ss4KAPX7A+eONK2A== X-Received: by 2002:a05:622a:1805:b0:3b9:bb27:e116 with SMTP id t5-20020a05622a180500b003b9bb27e116mr13098700qtc.1.1676834706084; Sun, 19 Feb 2023 11:25:06 -0800 (PST) Received: from localhost.localdomain (dsl-158-213.b2b2c.ca. [66.158.158.213]) by smtp.gmail.com with ESMTPSA id bz18-20020a05622a1e9200b003be56bdd3b1sm3288914qtb.92.2023.02.19.11.25.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 11:25:05 -0800 (PST) From: Maxim Cournoyer Date: Sun, 19 Feb 2023 14:23:59 -0500 Message-Id: <20230219192405.26549-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230219192405.26549-1-maxim.cournoyer@gmail.com> References: <20230219192405.26549-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: 3E84EFD4F X-Spam-Score: -0.84 X-Migadu-Spam-Score: -0.84 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: bLAcy2gwz0R5 * gnu/packages/gnuzilla.scm (%icecat-base-version): New variable. (%icecat-version): Define in terms of %icecat-base-version. (icecat-source): Adjust to use the above newly introduced variables. --- Changes in v4: - Re-obfuscate upstream-firefox-source gnu/packages/gnuzilla.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 3a742d06c6..bb379a7fb1 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -496,20 +496,19 @@ (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 %icecat-version (string-append %icecat-base-version "-guix0-preview1")) (define %icecat-build-id "20230214000000") ;must be of the form YYYYMMDDhhmmss ;; '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 #\-))) + (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 #\.))) - (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-version (string-append %icecat-base-version "esr")) (upstream-firefox-source (origin (method url-fetch) @@ -521,8 +520,9 @@ (define icecat-source (base32 "0j6afrgfsmd0adbbmffw4p1f2hznpck9d36z3bsjx36f7cjgdy27")))) - (upstream-icecat-base-version "102.8.0") ; maybe older than base-version - ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) + ;; The upstream-icecat-base-version may be older than the + ;; %icecat-base-version. + (upstream-icecat-base-version "102.8.0") (gnuzilla-commit "03d9e3db5affe21db077c410ec08c313d6aa280e") (gnuzilla-source (origin @@ -553,7 +553,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