qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/mastodon: use recurseIntoAttrs for better test ergonomics

Browse Source
This commit is contained in:
Kerstin Humm 2024-07-04 18:07:44 +02:00
parent f8290df5fd
commit d9cec95613
No known key found for this signature in database
GPG Key ID: 40293358C7B9326B
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View File

@ -534,7 +534,7 @@ in {
mailman = handleTest ./mailman.nix {};
man = handleTest ./man.nix {};
mariadb-galera = handleTest ./mysql/mariadb-galera.nix {};
mastodon = discoverTests (import ./web-apps/mastodon { inherit handleTestOn; });
mastodon = pkgs.recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; });
pixelfed = discoverTests (import ./web-apps/pixelfed { inherit handleTestOn; });
mate = handleTest ./mate.nix {};
mate-wayland = handleTest ./mate-wayland.nix {};

6
nixos/tests/web-apps/mastodon/default.nix
View File

@ -1,9 +1,9 @@
{ system ? builtins.currentSystem, handleTestOn }:
{ system ? builtins.currentSystem, pkgs, handleTestOn, ... }:
let
supportedSystems = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
in
{
standard = handleTestOn supportedSystems ./standard.nix { inherit system; };
remote-databases = handleTestOn supportedSystems ./remote-databases.nix { inherit system; };
standard = handleTestOn supportedSystems ./standard.nix { inherit system pkgs; };
remote-databases = handleTestOn supportedSystems ./remote-databases.nix { inherit system pkgs; };
}