Lispln/nonguix
1
0
Fork 0
mirror of https://gitlab.com/nonguix/nonguix.git synced 2024-12-23 15:24:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nongnu: firefox: Update to 80.0.1

Browse source 
* nongnu/packages/mozilla.scm (firefox): Update to 80.0.1
[native-inputs]: Update to rust@1.43 rust:cargo@1.43 node@10.22
rust-cbindgen@0.14.3.
[arguments]<phases>: In phase 'patch-cargo-checksums', use find-files to detect all Cargo.lock.
Generate cargo checksum for rust vendors in seperate directories.
<configure-flags>: Remove obsolete configure flags.
(%firefox-build-id): Update to 2020-09-08.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
This commit is contained in:
Zhu Zihao 2020-09-13 12:43:52 +02:00 committed by Jonathan Brielmaier
parent 2712c2bef2
commit 0c4b325642
No known key found for this signature in database
GPG key ID: ECFC83988B4E4B9F
1 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
nongnu/packages/mozilla.scm
View file

@ -39,6 +39,7 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages assembly) #:use-module (gnu packages assembly)
@ -96,19 +97,19 @@
`(("rust-heck" ,rust-heck-0.3) `(("rust-heck" ,rust-heck-0.3)
,@cargo-inputs))))))) ,@cargo-inputs)))))))
(define %firefox-build-id "20200719000000") (define %firefox-build-id "20200908000000")
(define-public firefox (define-public firefox
(package (package
(name "firefox") (name "firefox")
(version "75.0") (version "80.0.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://archive.mozilla.org/pub/firefox/releases/" (uri (string-append "https://archive.mozilla.org/pub/firefox/releases/"
version "/source/firefox-" version ".source.tar.xz")) version "/source/firefox-" version ".source.tar.xz"))
(sha256 (sha256
(base32 "03vbfh5zhb93nqxh43inyxm9i0w479sx6mh590scc5r7ix6hbcdv")))) (base32 "089ck6pq73nlw1bgjjvdaw7zjwb2bjk1w5hfjsx87mm269g0hssr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -129,8 +130,6 @@
;; "--with-system-nspr" ;; "--with-system-nspr"
;; "--with-system-nss" ;; "--with-system-nss"
"--with-system-bz2" ;TODO: Remove in FF78
"--enable-startup-notification" ;TODO: Remove in FF78
,(string-append "--with-clang-path=" ,(string-append "--with-clang-path="
clang "/bin/clang") clang "/bin/clang")
,(string-append "--with-libclang-path=" ,(string-append "--with-libclang-path="
@ -200,10 +199,33 @@
(let ((null-hash (let ((null-hash
;; This is the SHA256 output of an empty string. ;; This is the SHA256 output of an empty string.
"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")) "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))
(substitute* '("Cargo.lock" "gfx/wr/Cargo.lock") (for-each
(lambda (file)
(format #t "patch-cargo-checksums: patching checksums in ~a~%"
file)
(substitute* file
(("(checksum = )\".*\"" all name) (("(checksum = )\".*\"" all name)
(string-append name "\"" null-hash "\""))) (string-append name "\"" null-hash "\""))))
(generate-all-checksums "third_party/rust")) (find-files "." "Cargo\\.lock$"))
(for-each generate-all-checksums
'("build"
"dom/media"
"dom/webauthn"
"gfx"
"intl"
"js"
"media"
"modules"
"mozglue/static/rust"
"netwerk"
"remote"
"security/manager/ssl"
"servo"
"storage"
"third_party/rust"
"toolkit"
"xpcom/rust"
"services")))
#t)) #t))
(delete 'bootstrap) (delete 'bootstrap)
(replace 'configure (replace 'configure
@ -370,17 +392,17 @@
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("autoconf" ,autoconf-2.13) `(("autoconf" ,autoconf-2.13)
("cargo" ,rust-1.41 "cargo") ("cargo" ,rust-1.43 "cargo")
("clang" ,clang) ("clang" ,clang)
("llvm" ,llvm) ("llvm" ,llvm)
("nasm" ,nasm) ("nasm" ,nasm)
("node" ,node) ("node" ,node-10.22)
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python) ("python" ,python)
("python2" ,python-2.7) ("python2" ,python-2.7)
("rust" ,rust-1.41) ("rust" ,rust-1.43)
("rust-cbindgen" ,rust-cbindgen) ("rust-cbindgen" ,rust-cbindgen-0.14.3)
("which" ,which) ("which" ,which)
("yasm" ,yasm))) ("yasm" ,yasm)))
(home-page "https://mozilla.org/firefox/") (home-page "https://mozilla.org/firefox/")