Merge pull request #254296 from Gerg-L/direnv

nixos/direnv: remove persistDerivations

Changed files
+4 -14
nixos
modules
programs
+4 -14
nixos/modules/programs/direnv.nix
···
the hiding of direnv logging
'');
-
persistDerivations =
-
(lib.mkEnableOption (lib.mdDoc ''
-
setting keep-derivations and keep-outputs to true
-
to prevent shells from getting garbage collected
-
''))
-
// {
-
default = true;
-
};
-
loadInNixShell =
lib.mkEnableOption (lib.mdDoc ''
loading direnv in `nix-shell` `nix shell` or `nix develop`
···
};
};
+
imports = [
+
(lib.mkRemovedOptionModule ["programs" "direnv" "persistDerivations"] "persistDerivations was removed as it is on longer necessary")
+
];
+
config = lib.mkIf cfg.enable {
programs = {
···
${lib.getExe cfg.package} hook fish | source
end
'';
-
};
-
-
nix.settings = lib.mkIf cfg.persistDerivations {
-
keep-outputs = true;
-
keep-derivations = true;
};
environment = {