diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index 9bb78a97f36d..3f9cea6662fb 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -8,7 +8,7 @@ let firefoxPackage' = firefoxPackage.override (args: { in { - name = firefoxPackage'.unwrapped.binaryName; + name = firefoxPackage'.unwrapped.pname; meta = with pkgs.lib.maintainers; { maintainers = [ eelco shlevy ]; }; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 6ea82d80853e..7f9e1c27f5d5 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -27,7 +27,7 @@ rec { }; firefox-esr-102 = buildMozillaMach rec { - pname = "firefox-esr"; + pname = "firefox-esr-102"; version = "102.1.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { @@ -54,7 +54,7 @@ rec { }; firefox-esr-91 = buildMozillaMach rec { - pname = "firefox-esr"; + pname = "firefox-esr-91"; version = "91.12.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 9fec80aa56ea..f3c5ac668cff 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -3,6 +3,7 @@ , fetchurl , CoreServices , buildPackages +, nixosTests }: stdenv.mkDerivation rec { @@ -44,6 +45,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit (nixosTests) firefox firefox-esr-91 firefox-esr-102; + }; + meta = with lib; { homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Reference/NSPR_functions"; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index 9a3d7bdfe270..febc2423388e 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -15,6 +15,7 @@ , # allow FIPS mode. Note that this makes the output non-reproducible. # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6 enableFIPS ? false +, nixosTests }: let @@ -186,6 +187,12 @@ 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; + }; + meta = with lib; { homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"; description = "A set of libraries for development of security-enabled client and server applications";