From b167e0cb88ff5a72fd755c40659f0564a7b35f6c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 31 Aug 2023 13:41:32 +0200 Subject: [PATCH 1/2] nss_latest: 3.92 -> 3.93 https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/aC5r1-9zPWI --- pkgs/development/libraries/nss/latest.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index dfe3b066c878..db0ad2efad5e 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.92"; - hash = "sha256-PbGS1uiCA5rwKufq8yF+0RS7etg0FMZGdyq4Ah4kolQ="; + version = "3.93"; + hash = "sha256-FfVLtyBI6xBfjA6TagS4medMPbmhm7weAKzuKvlHaoo="; } From 82527892e46a17cff16c5842e2354a7f5b8d0025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 6 Sep 2023 15:51:59 +0200 Subject: [PATCH 2/2] firefox-esr: use nss_esr as intended Firefox 115 is meant against nss 3.90, as you can see e.g. in https://hg.mozilla.org/releases/mozilla-release/file/FIREFOX_115_0_3_RELEASE/security/nss/TAG-INFO --- pkgs/applications/networking/browsers/firefox/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 753e1c9d59ef..bb4b1ba0a85d 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -469,7 +469,7 @@ buildStdenv.mkDerivation { # icu73 changed how it follows symlinks which breaks in the firefox sandbox # https://bugzilla.mozilla.org/show_bug.cgi?id=1839287 ++ [ (if (lib.versionAtLeast version "115") then icu else icu72) ] - ++ [ (if (lib.versionAtLeast version "103") then nss_latest else nss_esr) ] + ++ [ (if (lib.versionAtLeast version "116") then nss_latest else nss_esr/*3.90*/) ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport libjack2 ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed