diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/nss/generic.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/nss/generic.nix | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/libraries/nss/generic.nix b/nixpkgs/pkgs/development/libraries/nss/generic.nix index b2d1c1e15fd8..b4330796e52c 100644 --- a/nixpkgs/pkgs/development/libraries/nss/generic.nix +++ b/nixpkgs/pkgs/development/libraries/nss/generic.nix @@ -16,6 +16,7 @@ # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6 enableFIPS ? false , nixosTests +, nss_latest }: let @@ -41,17 +42,12 @@ stdenv.mkDerivation rec { patches = [ # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch - (if (lib.versionOlder version "3.84") then - ./85_security_load_3.77+.patch - else - ./85_security_load_3.85+.patch - ) + ./85_security_load_3.85+.patch ./fix-cross-compilation.patch - ] ++ lib.optionals (lib.versionOlder version "3.89") [ - # Backport gcc-13 build fix: - # https://bugzilla.mozilla.org/show_bug.cgi?id=1771273 - # https://hg.mozilla.org/projects/nss/raw-rev/21e7aaa1f7d94bca15d997e5b4c2329b32fad21a - ./gcc-13-esr.patch + ] ++ lib.optionals (lib.versionOlder version "3.91") [ + # https://bugzilla.mozilla.org/show_bug.cgi?id=1836925 + # https://phabricator.services.mozilla.com/D180068 + ./remove-c25519-support.patch ]; patchFlags = [ "-p0" ]; @@ -185,10 +181,10 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.sh; - passthru.tests = lib.optionalAttrs (lib.versionOlder version "3.69") { - inherit (nixosTests) firefox-esr-91; - } // lib.optionalAttrs (lib.versionAtLeast version "3.69") { - inherit (nixosTests) firefox firefox-esr-102; + passthru.tests = lib.optionalAttrs (lib.versionOlder version nss_latest.version) { + inherit (nixosTests) firefox-esr-102; + } // lib.optionalAttrs (lib.versionAtLeast version nss_latest.version) { + inherit (nixosTests) firefox firefox-esr-115; }; meta = with lib; { |