From 5c8616a914f58e902ab38d63a143b3a8f1570881 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 12 Dec 2024 08:08:24 -0800 Subject: [PATCH] nixosTests: remove firefox-esr-115 tests This version of Firefox has reached EOL. --- nixos/tests/all-tests.nix | 1 - pkgs/development/libraries/nspr/default.nix | 2 +- pkgs/development/libraries/nss/generic.nix | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7c5842cbbca8..f7abbdb6dc70 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -340,7 +340,6 @@ in { firefox-beta = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-beta; }; firefox-devedition = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-devedition; }; firefox-esr = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job - firefox-esr-115 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-115; }; firefox-esr-128 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-128; }; firefoxpwa = handleTest ./firefoxpwa.nix {}; firejail = handleTest ./firejail.nix {}; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index e8cf01bb7a7e..61d69acc6077 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.tests = { - inherit (nixosTests) firefox firefox-esr-115; + inherit (nixosTests) firefox firefox-esr; }; meta = with lib; { diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index 38741f23a121..a40b0942737e 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -210,7 +210,7 @@ stdenv.mkDerivation rec { passthru.tests = lib.optionalAttrs (lib.versionOlder version nss_latest.version) { - inherit (nixosTests) firefox-esr-115; + inherit (nixosTests) firefox-esr; } // lib.optionalAttrs (lib.versionAtLeast version nss_latest.version) { inherit (nixosTests) firefox;