alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #185323 from mweinelt/nss-nspr-passthru-tests

Browse source
This commit is contained in:
Martin Weinelt 2022-08-07 12:15:03 +02:00 committed by GitHub
parent e61cf1052c a65e6b08c5
commit a171b96ed8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/firefox.nix
View file

@ -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 ];
};

4
pkgs/applications/networking/browsers/firefox/packages.nix
View file

@ -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 {

5
pkgs/development/libraries/nspr/default.nix
View file

@ -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";

7
pkgs/development/libraries/nss/generic.nix
View file

@ -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";