nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 00:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/tests: fix nix-serve path

Browse Source 
nixos/tests: rename nix-ssh-serve to nix-serve-ssh

nixos/tests/nix-serve-ssh: add --experimental-features

nixos-serve: add nix-serve-ssh to passthru.tests
This commit is contained in:
Artturin 2021-12-03 18:19:42 +02:00
parent 2fb77151e8
commit d87d5731d5
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,8 +315,8 @@ in
nginx-sso = handleTest ./nginx-sso.nix {}; nginx-sso = handleTest ./nginx-sso.nix {};
nginx-variants = handleTest ./nginx-variants.nix {}; nginx-variants = handleTest ./nginx-variants.nix {};
nitter = handleTest ./nitter.nix {}; nitter = handleTest ./nitter.nix {};
nix-serve = handleTest ./nix-ssh-serve.nix {}; nix-serve = handleTest ./nix-serve.nix {};
nix-ssh-serve = handleTest ./nix-ssh-serve.nix {}; nix-serve-ssh = handleTest ./nix-serve-ssh.nix {};
nixops = handleTest ./nixops/default.nix {}; nixops = handleTest ./nixops/default.nix {};
nixos-generate-config = handleTest ./nixos-generate-config.nix {}; nixos-generate-config = handleTest ./nixos-generate-config.nix {};
node-red = handleTest ./node-red.nix {}; node-red = handleTest ./node-red.nix {};

2
nixos/tests/nix-ssh-serve.nix → nixos/tests/nix-serve-ssh.nix
View File

@ -35,7 +35,7 @@ in
client.fail("diff /root/other-store$(cat mach-id-path) /etc/machine-id") client.fail("diff /root/other-store$(cat mach-id-path) /etc/machine-id")
# Currently due to shared store this is a noop :( # Currently due to shared store this is a noop :(
client.succeed("nix copy --to ssh-ng://nix-ssh@server $(cat mach-id-path)") client.succeed("nix copy --experimental-features 'nix-command' --to ssh-ng://nix-ssh@server $(cat mach-id-path)")
client.succeed( client.succeed(
"nix-store --realise $(cat mach-id-path) --store /root/other-store --substituters ssh-ng://nix-ssh@server" "nix-store --realise $(cat mach-id-path) --store /root/other-store --substituters ssh-ng://nix-ssh@server"
) )

5
pkgs/tools/package-management/nix-serve/default.nix
View File

@ -37,7 +37,10 @@ stdenv.mkDerivation {
--add-flags $out/libexec/nix-serve/nix-serve.psgi --add-flags $out/libexec/nix-serve/nix-serve.psgi
''; '';
passthru.tests.nix-serve = nixosTests.nix-serve; passthru.tests = {
nix-serve = nixosTests.nix-serve;
nix-serve-ssh = nixosTests.nix-serve-ssh;
};
meta = { meta = {
homepage = "https://github.com/edolstra/nix-serve"; homepage = "https://github.com/edolstra/nix-serve";