[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#32026: [PATCH 03/10] gnu: Define UPSTREAM-FIREFOX-SOURCE at the top
From: |
Maxim Cournoyer |
Subject: |
bug#32026: [PATCH 03/10] gnu: Define UPSTREAM-FIREFOX-SOURCE at the top level. |
Date: |
Mon, 13 Feb 2023 20:55:48 -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.
---
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
- bug#32026: [PATCH 05/10] gnu: icecat: Add a patch that makes building language packs reproducible., (continued)
bug#32026: [PATCH 04/10] gnu: icecat: Update the "ach" locale., Maxim Cournoyer, 2023/02/13
bug#32026: [PATCH 06/10] gnu: Add icecat-l10n and icedove-l10n., Maxim Cournoyer, 2023/02/13
bug#32026: [PATCH 08/10] gnu: Add language packs to icecat and icedove., Maxim Cournoyer, 2023/02/13
bug#32026: [PATCH 07/10] gnu: icedove: Automatically load system-provided extensions., Maxim Cournoyer, 2023/02/13
bug#32026: [PATCH 10/10] gnu: icecat: Use the locale of the system., Maxim Cournoyer, 2023/02/13
bug#32026: [PATCH 03/10] gnu: Define UPSTREAM-FIREFOX-SOURCE at the top level.,
Maxim Cournoyer <=