nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

ssh: don't install a client by default (#4016)

Browse source 
Make use of the recently added nullable `mkPackageOption` feature
to disable installing an SSH client by default: most people should use
the client provided by their system.
This commit is contained in:
Naïm Favier 2023-05-27 14:11:50 +02:00 • committed by GitHub
parent 6a19225683
commit 2d963854ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 8 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/modules/programs/ssh/default-config.nix
View file

@ -6,8 +6,6 @@ with lib;
config = {
programs.ssh = { enable = true; };
test.stubs.openssh = { };
home.file.assertions.text = builtins.toJSON
(map (a: a.message) (filter (a: !a.assertion) config.assertions));

2
tests/modules/programs/ssh/forwards-dynamic-bind-path-with-port-asserts.nix
View file

@ -17,8 +17,6 @@ with lib;
};
};
test.stubs.openssh = { };
test.asserts.assertions.expected = [ "Forwarded paths cannot have ports." ];
};
}

2
tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts.nix
View file

@ -27,8 +27,6 @@ with lib;
home.file.result.text = builtins.toJSON
(map (a: a.message) (filter (a: !a.assertion) config.assertions));
test.stubs.openssh = { };
nmt.script = ''
assertFileExists home-files/.ssh/config
assertFileContent \

2
tests/modules/programs/ssh/forwards-local-bind-path-with-port-asserts.nix
View file

@ -21,8 +21,6 @@ with lib;
};
};
test.stubs.openssh = { };
test.asserts.assertions.expected = [ "Forwarded paths cannot have ports." ];
};
}

2
tests/modules/programs/ssh/forwards-local-host-path-with-port-asserts.nix
View file

@ -21,8 +21,6 @@ with lib;
};
};
test.stubs.openssh = { };
test.asserts.assertions.expected = [ "Forwarded paths cannot have ports." ];
};
}

2
tests/modules/programs/ssh/forwards-remote-bind-path-with-port-asserts.nix
View file

@ -21,8 +21,6 @@ with lib;
};
};
test.stubs.openssh = { };
test.asserts.assertions.expected = [ "Forwarded paths cannot have ports." ];
};
}

2
tests/modules/programs/ssh/forwards-remote-host-path-with-port-asserts.nix
View file

@ -21,8 +21,6 @@ with lib;
};
};
test.stubs.openssh = { };
test.asserts.assertions.expected = [ "Forwarded paths cannot have ports." ];
};
}

2
tests/modules/programs/ssh/includes.nix
View file

@ -7,8 +7,6 @@
includes = [ "config.d/*" "other/dir" ];
};
test.stubs.openssh = { };
nmt.script = ''
assertFileExists home-files/.ssh/config
assertFileContains home-files/.ssh/config "Include config.d/* other/dir"

2
tests/modules/programs/ssh/match-blocks-attrs.nix
View file

@ -51,8 +51,6 @@ with lib;
home.file.assertions.text = builtins.toJSON
(map (a: a.message) (filter (a: !a.assertion) config.assertions));
test.stubs.openssh = { };
nmt.script = ''
assertFileExists home-files/.ssh/config
assertFileContent \

2
tests/modules/programs/ssh/match-blocks-match-and-hosts.nix
View file

@ -21,8 +21,6 @@ with lib;
home.file.assertions.text = builtins.toJSON
(map (a: a.message) (filter (a: !a.assertion) config.assertions));
test.stubs.openssh = { };
nmt.script = ''
assertFileExists home-files/.ssh/config
assertFileContent \