summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2021-08-09 11:57:57 +0200
committerRaphael Megzari <raphael@megzari.com>2021-08-10 07:43:50 +0900
commitafb0e73ebc17e558416491307ccfb02d585e4436 (patch)
treefd85ab8a6703d55409605b1077b8e88735956a65 /nixos/tests
parent810b03602b7c51c120503a1dbfa2a33c67a6f8d2 (diff)
downloadnixpkgs-afb0e73ebc17e558416491307ccfb02d585e4436.tar
nixpkgs-afb0e73ebc17e558416491307ccfb02d585e4436.tar.gz
nixpkgs-afb0e73ebc17e558416491307ccfb02d585e4436.tar.bz2
nixpkgs-afb0e73ebc17e558416491307ccfb02d585e4436.tar.lz
nixpkgs-afb0e73ebc17e558416491307ccfb02d585e4436.tar.xz
nixpkgs-afb0e73ebc17e558416491307ccfb02d585e4436.tar.zst
nixpkgs-afb0e73ebc17e558416491307ccfb02d585e4436.zip
firefox-esr-91: init at 91.0esr
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/all-tests.nix5
-rw-r--r--nixos/tests/firefox.nix9
2 files changed, 8 insertions, 6 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index dd9390e382b..e94259d07ca 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -126,8 +126,9 @@ in
   fancontrol = handleTest ./fancontrol.nix {};
   fcitx = handleTest ./fcitx {};
   ferm = handleTest ./ferm.nix {};
-  firefox = handleTest ./firefox.nix {};
-  firefox-esr = handleTest ./firefox.nix { esr = true; };
+  firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; };
+  firefox-esr-78 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-78; };
+  firefox-esr-91 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-91; };
   firejail = handleTest ./firejail.nix {};
   firewall = handleTest ./firewall.nix {};
   fish = handleTest ./fish.nix {};
diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix
index 2e27ac302af..4ad45c02240 100644
--- a/nixos/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ pkgs, esr ? false, ... }: {
+import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: {
   name = "firefox";
   meta = with pkgs.lib.maintainers; {
     maintainers = [ eelco shlevy ];
@@ -8,9 +8,10 @@ import ./make-test-python.nix ({ pkgs, esr ? false, ... }: {
     { pkgs, ... }:
 
     { imports = [ ./common/x11.nix ];
-      environment.systemPackages =
-        (if esr then [ pkgs.firefox-esr ] else [ pkgs.firefox ])
-        ++ [ pkgs.xdotool ];
+      environment.systemPackages = [
+        firefoxPackage
+        pkgs.xdotool
+      ];
 
       # Need some more memory to record audio.
       virtualisation.memorySize = "500";