diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-12-28 09:35:37 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-12-28 09:35:37 +0000 |
| commit | 092d57c07692d117e70f8e6ecbb65b241fc0060e (patch) | |
| tree | 35bbf470378036fce5ee3f89b940dafd0676774f /nixos/tests/all-tests.nix | |
| parent | 64a3a91ef4f3880cc0b74e33852602e6a0759e6a (diff) | |
| parent | 8fb6009616e0e6a00e74076b95c3c92e0769a193 (diff) | |
| download | nixpkgs-092d57c07692d117e70f8e6ecbb65b241fc0060e.tar nixpkgs-092d57c07692d117e70f8e6ecbb65b241fc0060e.tar.gz nixpkgs-092d57c07692d117e70f8e6ecbb65b241fc0060e.tar.bz2 nixpkgs-092d57c07692d117e70f8e6ecbb65b241fc0060e.tar.lz nixpkgs-092d57c07692d117e70f8e6ecbb65b241fc0060e.tar.xz nixpkgs-092d57c07692d117e70f8e6ecbb65b241fc0060e.tar.zst nixpkgs-092d57c07692d117e70f8e6ecbb65b241fc0060e.zip | |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
pkgs/development/tools/language-servers/ansible-language-server/default.nix
Diffstat (limited to 'nixos/tests/all-tests.nix')
| -rw-r--r-- | nixos/tests/all-tests.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 88b5f32e921..69697071629 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -73,6 +73,8 @@ in { agate = runTest ./web-servers/agate.nix; agda = handleTest ./agda.nix {}; airsonic = handleTest ./airsonic.nix {}; + akkoma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./akkoma.nix {}; + akkoma-confined = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./akkoma.nix { confined = true; }; allTerminfo = handleTest ./all-terminfo.nix {}; alps = handleTest ./alps.nix {}; amazon-init-shell = handleTest ./amazon-init-shell.nix {}; @@ -153,6 +155,7 @@ in { coturn = handleTest ./coturn.nix {}; couchdb = handleTest ./couchdb.nix {}; cri-o = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cri-o.nix {}; + cups-pdf = handleTest ./cups-pdf.nix {}; custom-ca = handleTest ./custom-ca.nix {}; croc = handleTest ./croc.nix {}; deluge = handleTest ./deluge.nix {}; @@ -211,7 +214,8 @@ in { firefox-esr = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job firefox-esr-102 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-102; }; firejail = handleTest ./firejail.nix {}; - firewall = handleTest ./firewall.nix {}; + firewall = handleTest ./firewall.nix { nftables = false; }; + firewall-nftables = handleTest ./firewall.nix { nftables = true; }; fish = handleTest ./fish.nix {}; flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {}; fluentd = handleTest ./fluentd.nix {}; @@ -413,6 +417,9 @@ in { nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; nat.standalone = handleTest ./nat.nix { withFirewall = false; }; + nat.nftables.firewall = handleTest ./nat.nix { withFirewall = true; nftables = true; }; + nat.nftables.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; nftables = true; }; + nat.nftables.standalone = handleTest ./nat.nix { withFirewall = false; nftables = true; }; nats = handleTest ./nats.nix {}; navidrome = handleTest ./navidrome.nix {}; nbd = handleTest ./nbd.nix {}; |