summary refs log tree commit diff
path: root/nixos/tests/firefox.nix
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2020-02-10 18:01:47 +0100
committerAndreas Rammhold <andreas@rammhold.de>2020-02-11 08:58:13 +0100
commit7a625e745346fbc87952a7af23ae6c88ade80ede (patch)
treec6feb387a751fb5250c7a70f907a0990459b180a /nixos/tests/firefox.nix
parentf43fdd115103e4fbe846fa8ff9bcb40c3997c86c (diff)
downloadnixpkgs-7a625e745346fbc87952a7af23ae6c88ade80ede.tar
nixpkgs-7a625e745346fbc87952a7af23ae6c88ade80ede.tar.gz
nixpkgs-7a625e745346fbc87952a7af23ae6c88ade80ede.tar.bz2
nixpkgs-7a625e745346fbc87952a7af23ae6c88ade80ede.tar.lz
nixpkgs-7a625e745346fbc87952a7af23ae6c88ade80ede.tar.xz
nixpkgs-7a625e745346fbc87952a7af23ae6c88ade80ede.tar.zst
nixpkgs-7a625e745346fbc87952a7af23ae6c88ade80ede.zip
nixos/tests/firefox: support running the test with the firefox ESR version
Also adds this to the release jobset.
Diffstat (limited to 'nixos/tests/firefox.nix')
-rw-r--r--nixos/tests/firefox.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix
index 56ddabbae77..7071baceba7 100644
--- a/nixos/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, esr ? false, ... }: {
   name = "firefox";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ eelco shlevy ];
@@ -8,7 +8,9 @@ import ./make-test-python.nix ({ pkgs, ... }: {
     { pkgs, ... }:
 
     { imports = [ ./common/x11.nix ];
-      environment.systemPackages = [ pkgs.firefox pkgs.xdotool ];
+      environment.systemPackages =
+        (if esr then [ pkgs.firefox-esr ] else [ pkgs.firefox ])
+        ++ [ pkgs.xdotool ];
     };
 
   testScript = ''