diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
| commit | 30f14243c33f1b386273d08a4776aa679c42143d (patch) | |
| tree | bd123d5c2ab4fef012ae7de6a225c092f8d611b8 /nixos/modules/programs | |
| parent | 50fccad5828fb459760fd7578951bb961a18c0fc (diff) | |
| parent | 2463e0917318581da94e7ba92703b63128c40424 (diff) | |
| download | nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.gz nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.bz2 nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.lz nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.xz nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.zst nixlib-30f14243c33f1b386273d08a4776aa679c42143d.zip | |
Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra: - 1255515 for nixos - 1255502 for nixpkgs
Diffstat (limited to 'nixos/modules/programs')
| -rw-r--r-- | nixos/modules/programs/fish.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/programs/ssh.nix | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index b4259f7ec87d..7a4b78118ce6 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -101,6 +101,9 @@ in end ''; + # include programs that bring their own completions + environment.pathsToLink = [ "/share/fish/vendor_completions.d" ]; + environment.systemPackages = [ pkgs.fish ]; environment.shells = [ diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 1ad45f468030..cc835081c9f9 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -189,6 +189,7 @@ in # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.) PubkeyAcceptedKeyTypes +ssh-dss + HostKeyAlgorithms +ssh-dss ${cfg.extraConfig} ''; |