diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/libraries/nss/generic.nix | |
parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
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; { |