diff options
author | Vladimír Čunát <v@cunat.cz> | 2022-12-09 10:27:46 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2022-12-09 10:27:46 +0100 |
commit | 9c497bb8d6015ee01fd78001539d73c3caa42eae (patch) | |
tree | 96062a61d173626b1337ecef982421e81ae8d29a /nixos/modules/config | |
parent | 1f4a528dc10a88466f5b15198cf3be139b847e7e (diff) | |
parent | 63c06ac400aa4d06fee7f32cb2504486862f2ff4 (diff) |
Merge branch 'staging-next' into staging
Diffstat (limited to 'nixos/modules/config')
-rw-r--r-- | nixos/modules/config/krb5/default.nix | 4 | ||||
-rw-r--r-- | nixos/modules/config/no-x-libs.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/config/krb5/default.nix b/nixos/modules/config/krb5/default.nix index e3e0fadf09638..df7a3f48236f0 100644 --- a/nixos/modules/config/krb5/default.nix +++ b/nixos/modules/config/krb5/default.nix @@ -82,8 +82,8 @@ in { kerberos = mkOption { type = types.package; - default = pkgs.krb5Full; - defaultText = literalExpression "pkgs.krb5Full"; + default = pkgs.krb5; + defaultText = literalExpression "pkgs.krb5"; example = literalExpression "pkgs.heimdal"; description = lib.mdDoc '' The Kerberos implementation that will be present in diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index eeb61289c44bf..3efadea823552 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -43,6 +43,7 @@ with lib; networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; }; networkmanager-sstp = super.networkmanager-vpnc.override { withGnome = false; }; networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; + pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; }; qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; }; qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; }); zbar = super.zbar.override { enableVideo = false; withXorg = false; }; |