From e4db21bcf634ac6bf8acc63659760659c44c8aeb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 16:33:50 +0100 Subject: gnu: nss: Remove obsolete patch. * gnu/packages/patches/nss-freebl-stubs.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/nss.scm (nss)[source](patches): Remove 'nss-freebl-stubs.patch'. --- gnu/packages/nss.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/nss.scm') diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 294891734d..28ca76df55 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -84,7 +84,6 @@ in the Mozilla clients.") "0vh23g16ldvnsrn2dnvdl2i133kizi660r7ilb00vfq2kvj45anr")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" - "nss-freebl-stubs.patch" "nss-increase-test-timeout.patch")))) (build-system gnu-build-system) (outputs '("out" "bin")) -- cgit v1.2.3 From ceb4b1d71595b65feb14e939ac6cbdc6b62e7223 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 16:35:50 +0100 Subject: gnu: nspr: Do not build the static library. * gnu/packages/nss.scm (nspr)[arguments]: Add "--disable-static" in #:configure-flags. --- gnu/packages/nss.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/nss.scm') diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 28ca76df55..865c0855ad 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -48,7 +48,8 @@ `(("perl" ,perl))) (arguments `(#:tests? #f ; no check target - #:configure-flags (list "--enable-64bit" + #:configure-flags (list "--disable-static" + "--enable-64bit" (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) -- cgit v1.2.3 From dabd2fc3d5280dc1566e3d30ecccfd3b37eb635e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 13 Feb 2020 19:37:57 +0100 Subject: gnu: nspr: Update to 4.25. * gnu/packages/nss.scm (nspr): Update to 4.25. --- gnu/packages/nss.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/nss.scm') diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 865c0855ad..f307d6a3b2 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -34,7 +34,7 @@ (define-public nspr (package (name "nspr") - (version "4.24") + (version "4.25") (source (origin (method url-fetch) (uri (string-append @@ -42,7 +42,7 @@ version "/src/nspr-" version ".tar.gz")) (sha256 (base32 - "1l0ksiny032jijgk0g76wf0kiq673i01izj7jrs2h5d1yq6rm9ch")))) + "0mjjk2b7ika3v4y99cnaqz3z1iq1a50r1psn9i3s87gr46z0khqb")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) -- cgit v1.2.3 From 8ff645f338f7825549f03d9c1b36c2e8ee433d02 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 13 Feb 2020 19:38:18 +0100 Subject: gnu: nss, nss-certs: Update to 3.50. * gnu/packages/nss.scm (nss): Update to 3.50. * gnu/packages/certs.scm (nss-certs): Likewise. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/nss.scm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/nss.scm') diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 864fe5def1..9f1acb8837 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -76,7 +76,7 @@ (define-public nss-certs (package (name "nss-certs") - (version "3.49.1") + (version "3.50") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -87,7 +87,7 @@ "nss-" version ".tar.gz"))) (sha256 (base32 - "0vh23g16ldvnsrn2dnvdl2i133kizi660r7ilb00vfq2kvj45anr")))) + "19rv0vp9nmvn6dy29qsv8f4v7wn5kizrpm59vbszahsjfwcz6p8q")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index f307d6a3b2..fe51fc2332 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -71,7 +71,7 @@ in the Mozilla clients.") (define-public nss (package (name "nss") - (version "3.49.1") + (version "3.50") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -82,7 +82,7 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "0vh23g16ldvnsrn2dnvdl2i133kizi660r7ilb00vfq2kvj45anr")) + "19rv0vp9nmvn6dy29qsv8f4v7wn5kizrpm59vbszahsjfwcz6p8q")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")))) @@ -130,7 +130,7 @@ in the Mozilla clients.") ;; leading to test failures: ;; . To ;; work around that, set the time to roughly the release date. - (invoke "faketime" "2020-01-01" "./nss/tests/all.sh"))) + (invoke "faketime" "2020-02-01" "./nss/tests/all.sh"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 21d0b64494ab7b6288d9d0289090ea28ec95f720 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 13 Feb 2020 19:54:41 +0100 Subject: gnu: nss: Delete bundled SQLite and Zlib. * gnu/packages/nss.scm (nss)[source](modules, snippet): New fields. --- gnu/packages/nss.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/nss.scm') diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index fe51fc2332..6d28f35915 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -85,7 +85,13 @@ in the Mozilla clients.") "19rv0vp9nmvn6dy29qsv8f4v7wn5kizrpm59vbszahsjfwcz6p8q")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" - "nss-increase-test-timeout.patch")))) + "nss-increase-test-timeout.patch")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "nss/lib/zlib") + (delete-file-recursively "nss/lib/sqlite") + #t)))) (build-system gnu-build-system) (outputs '("out" "bin")) (arguments -- cgit v1.2.3 From 71949dac8babb80efd6d010c1c4b99c6534e5e0f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Feb 2020 19:54:18 +0100 Subject: gnu: nss: Add comment about deleted libraries. * gnu/packages/nss.scm (source)[snippet]: Add comment. While at it, add missing copyright information for Marius Bakke. --- gnu/packages/nss.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/nss.scm') diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 6d28f35915..9112206c81 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,6 +90,7 @@ in the Mozilla clients.") (modules '((guix build utils))) (snippet '(begin + ;; Delete the bundled copy of these libraries. (delete-file-recursively "nss/lib/zlib") (delete-file-recursively "nss/lib/sqlite") #t)))) -- cgit v1.2.3