diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-06-10 12:01:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-10 12:01:42 +0000 |
| commit | 80d3c080a94b48edb5c0ab647fde31dd58479905 (patch) | |
| tree | 57f146705a17c7e803a21430f685a8606ac53cb6 /nixos/tests | |
| parent | dc790b00e86a0e136439744897b2b82f4dcd1db8 (diff) | |
| parent | 33d84e02ee99fbb5254ad0daadfdc5ddad1d4241 (diff) | |
| download | nixpkgs-80d3c080a94b48edb5c0ab647fde31dd58479905.tar nixpkgs-80d3c080a94b48edb5c0ab647fde31dd58479905.tar.gz nixpkgs-80d3c080a94b48edb5c0ab647fde31dd58479905.tar.bz2 nixpkgs-80d3c080a94b48edb5c0ab647fde31dd58479905.tar.lz nixpkgs-80d3c080a94b48edb5c0ab647fde31dd58479905.tar.xz nixpkgs-80d3c080a94b48edb5c0ab647fde31dd58479905.tar.zst nixpkgs-80d3c080a94b48edb5c0ab647fde31dd58479905.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/all-tests.nix | 9 | ||||
| -rw-r--r-- | nixos/tests/matrix/appservice-irc.nix (renamed from nixos/tests/matrix-appservice-irc.nix) | 2 | ||||
| -rw-r--r-- | nixos/tests/matrix/conduit.nix (renamed from nixos/tests/matrix-conduit.nix) | 2 | ||||
| -rw-r--r-- | nixos/tests/matrix/dendrite.nix (renamed from nixos/tests/dendrite.nix) | 2 | ||||
| -rw-r--r-- | nixos/tests/matrix/synapse.nix (renamed from nixos/tests/matrix-synapse.nix) | 4 |
5 files changed, 9 insertions, 10 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 1064d62da93..38c320886d1 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -112,7 +112,7 @@ in { croc = handleTest ./croc.nix {}; cryptpad = handleTest ./cryptpad.nix {}; deluge = handleTest ./deluge.nix {}; - dendrite = handleTest ./dendrite.nix {}; + dendrite = handleTest ./matrix/dendrite.nix {}; dex-oidc = handleTest ./dex-oidc.nix {}; dhparams = handleTest ./dhparams.nix {}; disable-installer-tools = handleTest ./disable-installer-tools.nix {}; @@ -301,9 +301,9 @@ in { mariadb-galera = handleTest ./mysql/mariadb-galera.nix {}; mastodon = handleTestOn ["x86_64-linux" "i686-linux" "aarch64-linux"] ./web-apps/mastodon.nix {}; matomo = handleTest ./matomo.nix {}; - matrix-appservice-irc = handleTest ./matrix-appservice-irc.nix {}; - matrix-conduit = handleTest ./matrix-conduit.nix {}; - matrix-synapse = handleTest ./matrix-synapse.nix {}; + matrix-appservice-irc = handleTest ./matrix/appservice-irc.nix {}; + matrix-conduit = handleTest ./matrix/conduit.nix {}; + matrix-synapse = handleTest ./matrix/synapse.nix {}; mattermost = handleTest ./mattermost.nix {}; mediatomb = handleTest ./mediatomb.nix {}; mediawiki = handleTest ./mediawiki.nix {}; @@ -422,7 +422,6 @@ in { pgjwt = handleTest ./pgjwt.nix {}; pgmanage = handleTest ./pgmanage.nix {}; php = handleTest ./php {}; - php74 = handleTest ./php { php = pkgs.php74; }; php80 = handleTest ./php { php = pkgs.php80; }; php81 = handleTest ./php { php = pkgs.php81; }; pict-rs = handleTest ./pict-rs.nix {}; diff --git a/nixos/tests/matrix-appservice-irc.nix b/nixos/tests/matrix/appservice-irc.nix index 70d45852398..7dd44da8305 100644 --- a/nixos/tests/matrix-appservice-irc.nix +++ b/nixos/tests/matrix/appservice-irc.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ../make-test-python.nix ({ pkgs, ... }: let homeserverUrl = "http://homeserver:8008"; in diff --git a/nixos/tests/matrix-conduit.nix b/nixos/tests/matrix/conduit.nix index d159fbaa480..780837f962f 100644 --- a/nixos/tests/matrix-conduit.nix +++ b/nixos/tests/matrix/conduit.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ../make-test-python.nix ({ pkgs, ... }: let name = "conduit"; in diff --git a/nixos/tests/dendrite.nix b/nixos/tests/matrix/dendrite.nix index 1ff415433b4..82e71d91213 100644 --- a/nixos/tests/dendrite.nix +++ b/nixos/tests/matrix/dendrite.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ( +import ../make-test-python.nix ( { pkgs, ... }: let homeserverUrl = "http://homeserver:8008"; diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix/synapse.nix index 1ff1e47b284..756a8d5de49 100644 --- a/nixos/tests/matrix-synapse.nix +++ b/nixos/tests/matrix/synapse.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... } : let +import ../make-test-python.nix ({ pkgs, ... } : let runWithOpenSSL = file: cmd: pkgs.runCommand file { @@ -27,7 +27,7 @@ import ./make-test-python.nix ({ pkgs, ... } : let ''; - mailerCerts = import ./common/acme/server/snakeoil-certs.nix; + mailerCerts = import ../common/acme/server/snakeoil-certs.nix; mailerDomain = mailerCerts.domain; registrationSharedSecret = "unsecure123"; testUser = "alice"; |