Merge branch 'staging-next' into staging

Conflicts:
	pkgs/development/python-modules/panel/default.nix
	pkgs/os-specific/linux/kernel/generic.nix
	pkgs/servers/home-assistant/default.nix
This commit is contained in:
Dmitry Kalinkin
2021-04-08 22:42:26 -04:00
127 changed files with 8479 additions and 625 deletions
+11
View File
@@ -0,0 +1,11 @@
{ runCommandNoCC, openssh }:
runCommandNoCC "ssh-copy-id-${openssh.version}" {
meta = openssh.meta // {
description = "A tool to copy SSH public keys to a remote machine";
priority = (openssh.meta.priority or 0) - 1;
};
} ''
install -Dm 755 {${openssh},$out}/bin/ssh-copy-id
install -Dm 644 {${openssh},$out}/share/man/man1/ssh-copy-id.1.gz
''