c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

nixos/direnv: remove obsolete finalPackage

Browse source 
direnv doesn't ship with a fish config anymore, which makes the
finalPackage option obsolete.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu 2026-01-01 20:08:40 +01:00
commit 26a640f83d
No known key found for this signature in database
GPG key ID: E13DFD4B47127951
1 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

28
nixos/modules/programs/direnv.nix
View file

@ -16,6 +16,11 @@ let
format = pkgs.formats.toml { };
in
{
imports = [
(lib.mkRemovedOptionModule [ "programs" "direnv" "finalPackage" ]
"programs.direnv.finalPackage has been removed now, as its value is identical to programs.direnv.package."
)
];
options.programs.direnv = {
enable = lib.mkEnableOption ''
@ -26,12 +31,6 @@ in
package = lib.mkPackageOption pkgs "direnv" { };
finalPackage = lib.mkOption {
type = lib.types.package;
readOnly = true;
description = "The wrapped direnv package.";
};
enableBashIntegration = enabledOption ''
Bash integration
'';
@ -100,15 +99,6 @@ in
config = lib.mkIf cfg.enable {
programs = {
direnv = {
finalPackage = pkgs.symlinkJoin {
inherit (cfg.package) name;
paths = [ cfg.package ];
# direnv has a fish library which automatically sources direnv for some reason
postBuild = ''
rm -rf "$out/share/fish"
'';
meta.mainProgram = "direnv";
};
settings = lib.mkIf cfg.silent {
global = {
log_format = lib.mkDefault "-";
@ -119,7 +109,7 @@ in
zsh.interactiveShellInit = lib.mkIf cfg.enableZshIntegration ''
if ${lib.boolToString cfg.loadInNixShell} || printenv PATH | grep -vqc '/nix/store'; then
eval "$(${lib.getExe cfg.finalPackage} hook zsh)"
eval "$(${lib.getExe cfg.package} hook zsh)"
fi
'';
@ -127,13 +117,13 @@ in
#$IN_NIX_SHELL for "nix-shell"
bash.interactiveShellInit = lib.mkIf cfg.enableBashIntegration ''
if ${lib.boolToString cfg.loadInNixShell} || [ -z "$IN_NIX_SHELL$NIX_GCROOT$(printenv PATH | grep '/nix/store')" ] ; then
eval "$(${lib.getExe cfg.finalPackage} hook bash)"
eval "$(${lib.getExe cfg.package} hook bash)"
fi
'';
fish.interactiveShellInit = lib.mkIf cfg.enableFishIntegration ''
if ${lib.boolToString cfg.loadInNixShell}; or printenv PATH | grep -vqc '/nix/store';
${lib.getExe cfg.finalPackage} hook fish | source
${lib.getExe cfg.package} hook fish | source
end
'';
@ -153,7 +143,7 @@ in
environment = {
systemPackages = [
cfg.finalPackage
cfg.package
];
variables.DIRENV_CONFIG = "/etc/direnv";