diff options
| author | taku0 <mxxouy6x3m_github@tatapa.org> | 2018-03-14 23:21:52 +0900 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-03-16 03:42:09 +0000 |
| commit | 16ee6b5ed97ac55955c3c67cb7ad6cf1079bded9 (patch) | |
| tree | 27fd81ff8a505094463fe50c2f5b2210dd227ac7 /pkgs/development/libraries/nss | |
| parent | d4be6b330e0a61f996aadf5a6cc1b2ad2f18c383 (diff) | |
| download | nixpkgs-16ee6b5ed97ac55955c3c67cb7ad6cf1079bded9.tar nixpkgs-16ee6b5ed97ac55955c3c67cb7ad6cf1079bded9.tar.gz nixpkgs-16ee6b5ed97ac55955c3c67cb7ad6cf1079bded9.tar.bz2 nixpkgs-16ee6b5ed97ac55955c3c67cb7ad6cf1079bded9.tar.lz nixpkgs-16ee6b5ed97ac55955c3c67cb7ad6cf1079bded9.tar.xz nixpkgs-16ee6b5ed97ac55955c3c67cb7ad6cf1079bded9.tar.zst nixpkgs-16ee6b5ed97ac55955c3c67cb7ad6cf1079bded9.zip | |
nss: 3.34.1 -> 3.35; cacert.certdata2pem: 20160104 -> 20170717
Diffstat (limited to 'pkgs/development/libraries/nss')
| -rw-r--r-- | pkgs/development/libraries/nss/85_security_load.patch | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/nss/default.nix | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/nss/85_security_load.patch b/pkgs/development/libraries/nss/85_security_load.patch index 7687ea9bedb..132d5a96b29 100644 --- a/pkgs/development/libraries/nss/85_security_load.patch +++ b/pkgs/development/libraries/nss/85_security_load.patch @@ -13,10 +13,10 @@ diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/cmd/shlibsign/shlibsign.c nss/cmd/sh diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/coreconf/config.mk nss/coreconf/config.mk --- nss/coreconf/config.mk 2017-01-04 15:24:24.000000000 +0100 +++ nss/coreconf/config.mk 2017-01-24 14:43:47.989432372 +0100 -@@ -208,3 +208,6 @@ - # exported symbols, which causes problem when NSS is built as part of Mozilla. - # So we add a NSS_SSL_ENABLE_ZLIB variable to allow Mozilla to turn this off. - NSS_SSL_ENABLE_ZLIB = 1 +@@ -202,3 +202,6 @@ + + # Hide old, deprecated, TLS cipher suite names when building NSS + DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES + +# Nix specific stuff. +DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\" diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index a8f36af5df5..5c23f3dfde9 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.34.1"; + version = "3.35"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_34_1_RTM/src/${name}.tar.gz"; - sha256 = "186x33wsk4mzjz7dzbn8p0py9a0nzkgzpfkdv4rlyy5gghv5vhd3"; + url = "mirror://mozilla/security/nss/releases/NSS_3_35_RTM/src/${name}.tar.gz"; + sha256 = "1ypn68z9ncbbshi3184ywrhx5i846lyd72gps1grzqzdkgh7s4pl"; }; buildInputs = [ perl zlib sqlite ] |