gnu: torbrowser: Change version to 13.0.8.

* gnu/packages/tor.scm (%torbrowser-version): New variable.
(%torbrowser-firefox-version): New variable.
(torbrowser-assets)[version]: Use %torbrowser-version.
(torbrowser)[version]: Use %torbrowser-version.
[source]: Use %torbrowser-firefox-version.
[arguments]: Use the package version.

Change-Id: I4d262e0a9528ff515da89c31589d88201dcdf941
This commit is contained in:
Clément Lassieur 2023-12-28 15:57:36 +01:00
parent bc509aba83
commit 9c0a06c98c
No known key found for this signature in database
GPG key ID: 89F96D4808F359C7

View file

@ -13,6 +13,7 @@
;;; Copyright © 2021-2023 Danial Behzadi <dani.behzi@ubuntu.com> ;;; Copyright © 2021-2023 Danial Behzadi <dani.behzi@ubuntu.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Jim Newsome <jnewsome@torproject.org> ;;; Copyright © 2022 Jim Newsome <jnewsome@torproject.org>
;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -489,12 +490,23 @@ (define-public tractor
up with TOR on your system anymore.") up with TOR on your system anymore.")
(license license:gpl3+))) (license license:gpl3+)))
;; Must be of the form YYYYMMDDhhmmss as in `date +%Y%m%d%H%M%S`.
(define %moz-build-date "20231219173144")
;; To find the last version, look at https://www.torproject.org/download/.
(define %torbrowser-version "13.0.8")
;; To find the last Firefox version, browse
;; https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrowser-version>
;; There should be only one archive that starts with
;; "src-firefox-tor-browser-".
(define %torbrowser-firefox-version "115.6.0esr-13.0-1-build2")
(define torbrowser-assets (define torbrowser-assets
;; This is a prebuilt Torbrowser from which we take the assets we need. ;; This is a prebuilt Torbrowser from which we take the assets we need.
(package (package
(name "torbrowser-assets") (name "torbrowser-assets")
;; To find the last version, look at https://www.torproject.org/download/. (version %torbrowser-version)
(version "13.0.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -519,26 +531,19 @@ (define torbrowser-assets
Browser.") Browser.")
(license license:silofl1.1))) (license license:silofl1.1)))
;; Must be of the form YYYYMMDDhhmmss as in `date +%Y%m%d%H%M%S`.
(define %moz-build-date "20231219173144")
(define-public torbrowser (define-public torbrowser
(package (package
(inherit icecat-minimal) (inherit icecat-minimal)
(name "torbrowser") (name "torbrowser")
;; To find the last version, browse (version %torbrowser-version)
;; https://archive.torproject.org/tor-package-archive/torbrowser/<version>
;; (<version> is the version of the `torbrowser-assets` package). There
;; should be only one archive that starts with "src-firefox-tor-browser-".
(version "115.6.0esr-13.0-1-build2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (uri
(string-append (string-append
"https://archive.torproject.org/tor-package-archive/torbrowser/" "https://archive.torproject.org/tor-package-archive/torbrowser/"
(package-version torbrowser-assets) version "/src-firefox-tor-browser-" %torbrowser-firefox-version
"/src-firefox-tor-browser-" version ".tar.xz")) ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1c0p8aya7sh7nmawngkyzx2r02mvl9nd53hx2bl0jwvsj1vxxhca")))) "1c0p8aya7sh7nmawngkyzx2r02mvl9nd53hx2bl0jwvsj1vxxhca"))))
@ -554,9 +559,7 @@ (define-public torbrowser
"--with-user-appdir=.torbrowser" "--with-user-appdir=.torbrowser"
"--with-branding=browser/branding/tb-release" "--with-branding=browser/branding/tb-release"
(string-append "--prefix=" #$output) (string-append "--prefix=" #$output)
(string-append "--with-base-browser-version=" (string-append "--with-base-browser-version=" #$version)
#$(package-version
(this-package-input "torbrowser-assets")))
#$flags)) #$flags))
((#:phases phases) ((#:phases phases)
#~(modify-phases #$phases #~(modify-phases #$phases