diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2023-07-05 02:22:26 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2023-07-05 02:22:26 +0200 |
| commit | 2819e547d3042da197b1f8d3c1e5b7264256654d (patch) | |
| tree | 47acb6ef1e0a63078cbf44271f44b17d23bd1dd5 /pkgs/development/libraries/nss | |
| parent | fb7b05b21dba1d6d81a3a91015730d61a119fd59 (diff) | |
| parent | c0ba7fbc99d9fbd27769055a428ed62d399eb806 (diff) | |
| download | nixpkgs-2819e547d3042da197b1f8d3c1e5b7264256654d.tar nixpkgs-2819e547d3042da197b1f8d3c1e5b7264256654d.tar.gz nixpkgs-2819e547d3042da197b1f8d3c1e5b7264256654d.tar.bz2 nixpkgs-2819e547d3042da197b1f8d3c1e5b7264256654d.tar.lz nixpkgs-2819e547d3042da197b1f8d3c1e5b7264256654d.tar.xz nixpkgs-2819e547d3042da197b1f8d3c1e5b7264256654d.tar.zst nixpkgs-2819e547d3042da197b1f8d3c1e5b7264256654d.zip | |
Merge branch 'staging-next' into staging
; Conflicts: ; pkgs/development/libraries/nss/generic.nix - bb53634671d5bb63e060919d5062d079b5e50b98 removed the conditionals since firefox-esr-91 and nss <3.69 has been dropped a while ago. - cb3762857d1aa0951b3bd4b427994eab9002e517 updated the conditionals to always partition the tests based on the nss_latest version. Chosen that since it will remain future proof.
Diffstat (limited to 'pkgs/development/libraries/nss')
| -rw-r--r-- | pkgs/development/libraries/nss/generic.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index ea5faec8cad..b4330796e52 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/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 @@ -180,8 +181,10 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.sh; - passthru.tests = { - 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; { |