Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

terminfo: symlink terminfo to /etc for ncurses

+34 -9
-1
nixos/modules/config/system-path.nix
··· 115 "/share/mime" 116 "/share/nano" 117 "/share/org" 118 - "/share/terminfo" 119 "/share/themes" 120 "/share/vim-plugins" 121 "/share/vulkan"
··· 115 "/share/mime" 116 "/share/nano" 117 "/share/org" 118 "/share/themes" 119 "/share/vim-plugins" 120 "/share/vulkan"
+33
nixos/modules/config/terminfo.nix
···
··· 1 + # This module manages the terminfo database 2 + # and its integration in the system. 3 + { config, ... }: 4 + { 5 + config = { 6 + 7 + environment.pathsToLink = [ 8 + "/share/terminfo" 9 + ]; 10 + 11 + environment.etc."terminfo" = { 12 + source = "${config.system.path}/share/terminfo"; 13 + }; 14 + 15 + environment.profileRelativeEnvVars = { 16 + TERMINFO_DIRS = [ "/share/terminfo" ]; 17 + }; 18 + 19 + environment.extraInit = '' 20 + 21 + # reset TERM with new TERMINFO available (if any) 22 + export TERM=$TERM 23 + ''; 24 + 25 + security.sudo.extraConfig = '' 26 + 27 + # Keep terminfo database for root and %wheel. 28 + Defaults:root,%wheel env_keep+=TERMINFO_DIRS 29 + Defaults:root,%wheel env_keep+=TERMINFO 30 + ''; 31 + 32 + }; 33 + }
+1
nixos/modules/module-list.nix
··· 21 ./config/sysctl.nix 22 ./config/system-environment.nix 23 ./config/system-path.nix 24 ./config/timezone.nix 25 ./config/unix-odbc-drivers.nix 26 ./config/users-groups.nix
··· 21 ./config/sysctl.nix 22 ./config/system-environment.nix 23 ./config/system-path.nix 24 + ./config/terminfo.nix 25 ./config/timezone.nix 26 ./config/unix-odbc-drivers.nix 27 ./config/users-groups.nix
-4
nixos/modules/programs/environment.nix
··· 34 { PATH = [ "/bin" ]; 35 INFOPATH = [ "/info" "/share/info" ]; 36 PKG_CONFIG_PATH = [ "/lib/pkgconfig" ]; 37 - TERMINFO_DIRS = [ "/share/terminfo" ]; 38 PERL5LIB = [ "/lib/perl5/site_perl" ]; 39 KDEDIRS = [ "" ]; 40 STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ]; ··· 50 51 environment.extraInit = 52 '' 53 - # reset TERM with new TERMINFO available (if any) 54 - export TERM=$TERM 55 - 56 unset ASPELL_CONF 57 for i in ${concatStringsSep " " (reverseList cfg.profiles)} ; do 58 if [ -d "$i/lib/aspell" ]; then
··· 34 { PATH = [ "/bin" ]; 35 INFOPATH = [ "/info" "/share/info" ]; 36 PKG_CONFIG_PATH = [ "/lib/pkgconfig" ]; 37 PERL5LIB = [ "/lib/perl5/site_perl" ]; 38 KDEDIRS = [ "" ]; 39 STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ]; ··· 49 50 environment.extraInit = 51 '' 52 unset ASPELL_CONF 53 for i in ${concatStringsSep " " (reverseList cfg.profiles)} ; do 54 if [ -d "$i/lib/aspell" ]; then
-4
nixos/modules/security/sudo.nix
··· 66 # Don't edit this file. Set the NixOS options ‘security.sudo.configFile’ 67 # or ‘security.sudo.extraConfig’ instead. 68 69 - # Environment variables to keep for root and %wheel. 70 - Defaults:root,%wheel env_keep+=TERMINFO_DIRS 71 - Defaults:root,%wheel env_keep+=TERMINFO 72 - 73 # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic. 74 Defaults env_keep+=SSH_AUTH_SOCK 75
··· 66 # Don't edit this file. Set the NixOS options ‘security.sudo.configFile’ 67 # or ‘security.sudo.extraConfig’ instead. 68 69 # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic. 70 Defaults env_keep+=SSH_AUTH_SOCK 71