Subject: bug#32026: [PATCH v3 03/11] gnu: Define UPSTREAM-FIREFOX-SOURCE at the top level.

From: Maxim Cournoyer <[email-masked]>
Date: Fri, 17 Feb 2023 07:55:30 -0500

* 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