TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: nss: Update to 3.88.1.

Browse source 
* gnu/packages/nss.scm (nss)[source]: Update to 3.88.1.
[replacement]: Remove.
[propagated-inputs]: Change 'nspr' to 'nspr-next'.
(nss-next, nss/fixed): Remove.
* gnu/packages/gnuzilla.scm (icecat-minimal)[inputs]: Change 'nss-next'
to 'nss'.
(icedove-minimal)[inputs]: Likewise.
This commit is contained in:
Ludovic Courtès 2023-03-04 15:39:30 +01:00
parent f14ead765b
commit 6febc26827
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 6 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/gnuzilla.scm
View file

@ -736,7 +736,7 @@ (define-public icecat-minimal
hunspell hunspell
libnotify libnotify
nspr-next nspr-next
nss-next nss
shared-mime-info shared-mime-info
sqlite sqlite
eudev eudev
@ -1533,7 +1533,7 @@ (define-public icedove-minimal
libxt libxt
mesa mesa
mit-krb5 mit-krb5
nss-next nss
pango pango
pixman pixman
pulseaudio pulseaudio

30
gnu/packages/nss.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013-2019, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2021 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2021 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016-2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016-2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@ -115,10 +115,9 @@ (define-public nspr-next
(define-public nss (define-public nss
(package (package
(name "nss") (name "nss")
(replacement nss/fixed)
;; Also update and test the nss-certs package, which duplicates version and ;; Also update and test the nss-certs package, which duplicates version and
;; source to avoid a top-level variable reference & module cycle. ;; source to avoid a top-level variable reference & module cycle.
(version "3.82") (version "3.88.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (let ((version-with-underscores (uri (let ((version-with-underscores
@ -129,7 +128,7 @@ (define-public nss
"nss-" version ".tar.gz"))) "nss-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"0wqmgibacxf5i3jlm8jl50qasv2spwx07ixlscz9byf2f8xnggrj")) "15il9fsmixa1r4446zq1wl627sg0hz9h67w6kjxz273xz3nl7li7"))
;; 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"
@ -218,7 +217,7 @@ (define-public nss
(inputs (inputs
(list sqlite zlib)) (list sqlite zlib))
(propagated-inputs (propagated-inputs
(list nspr)) ;required by nss.pc. (list nspr-next)) ;required by nss.pc.
(native-inputs (native-inputs
(list perl libfaketime)) ;for tests (list perl libfaketime)) ;for tests
@ -236,24 +235,3 @@ (define-public nss
security standards.") security standards.")
(license license:mpl2.0))) (license license:mpl2.0)))
(define-public nss-next
(package
(inherit nss)
(version "3.88.1")
(source (origin
(inherit (package-source nss))
(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
"15il9fsmixa1r4446zq1wl627sg0hz9h67w6kjxz273xz3nl7li7"))))
(propagated-inputs (list nspr-next)))) ;required by nss.pc
(define nss/fixed
(package
(inherit nss-next)
(version "3.88"))) ; slight inaccuracy to allow grafting