me/guix
Archived
1
0
Fork 0
Code Activity

gnu: nss: Update to 3.71.

Browse source 
This is made in an attempt to get rid of non-deterministic test failures,
namely:

  [  FAILED  ] TlsConnectDatagram13.AeadLimit

* gnu/packages/nss.scm (nss): Update comment about nss-certs.  Update to 3.71.
[phases]{check}: Update faketime date.
[inputs]{sqlite}: Use the regular version.
* gnu/packages/certs.scm (nss-certs): Inherit version and source from nss.
This commit is contained in:
Maxim Cournoyer 2021-10-20 23:31:41 -04:00
parent b8324050ad
commit 8f78f61c02
No known key found for this signature in database
GPG key ID: 1260E46482E63562
2 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/certs.scm
View file

@ -128,18 +128,8 @@ that was originally contributed to Debian.")
(define-public nss-certs (define-public nss-certs
(package (package
(name "nss-certs") (name "nss-certs")
(version "3.67") (version (package-version nss))
(source (origin (source (package-source nss))
(method url-fetch)
(uri (let ((version-with-underscores
(string-join (string-split version #\.) "_")))
(string-append
"https://ftp.mozilla.org/pub/mozilla.org/security/nss/"
"releases/NSS_" version-with-underscores "_RTM/src/"
"nss-" version ".tar.gz")))
(sha256
(base32
"0zyfi27lbdz1bmk9dmsivcya4phx25rzlxqcnjab69yd928rlm7n"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out")) (outputs '("out"))
(native-inputs (native-inputs

14
gnu/packages/nss.scm
View file

@ -94,12 +94,12 @@ platform-neutral API for system level and libc-like functions. It is used
in the Mozilla clients.") in the Mozilla clients.")
(license license:mpl2.0))) (license license:mpl2.0)))
;;; Note: When updating, also update the nss-certs package, which cannot ;;; Note: When updating, verify that the nss-certs package still builds fine
;;; inherit from here. ;;; as it inherits its source from the nss package.
(define-public nss (define-public nss
(package (package
(name "nss") (name "nss")
(version "3.67") (version "3.71")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (let ((version-with-underscores (uri (let ((version-with-underscores
@ -110,7 +110,7 @@ in the Mozilla clients.")
"nss-" version ".tar.gz"))) "nss-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"0zyfi27lbdz1bmk9dmsivcya4phx25rzlxqcnjab69yd928rlm7n")) "0ly2l3dv6z5hlxs72h5x6796ni3x1bq60saavaf42ddgv4ax7b4r"))
;; Create nss.pc and nss-config. ;; Create nss.pc and nss-config.
(patches (search-patches "nss-3.56-pkgconfig.patch" (patches (search-patches "nss-3.56-pkgconfig.patch"
"nss-getcwd-nonnull.patch" "nss-getcwd-nonnull.patch"
@ -163,7 +163,7 @@ in the Mozilla clients.")
;; leading to test failures: ;; leading to test failures:
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To
;; work around that, set the time to roughly the release date. ;; work around that, set the time to roughly the release date.
(invoke "faketime" "2021-06-01" "./nss/tests/all.sh")) (invoke "faketime" "2021-09-30" "./nss/tests/all.sh"))
(format #t "test suite not run~%")))) (format #t "test suite not run~%"))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -187,9 +187,7 @@ in the Mozilla clients.")
(copy-recursively (string-append obj "/bin") bin) (copy-recursively (string-append obj "/bin") bin)
(copy-recursively (string-append obj "/lib") lib))))))) (copy-recursively (string-append obj "/lib") lib)))))))
(inputs (inputs
`(;; XXX: Build with SQLite 3.33 to work around `(("sqlite" ,sqlite)
;; https://bugzilla.mozilla.org/show_bug.cgi?id=1714874
("sqlite" ,sqlite-3.33)
("zlib" ,zlib))) ("zlib" ,zlib)))
(propagated-inputs (propagated-inputs
`(("nspr" ,nspr))) ;required by nss.pc. `(("nspr" ,nspr))) ;required by nss.pc.