Merge pull request #254296 from Gerg-L/direnv

nixos/direnv: remove persistDerivations
This commit is contained in:
Fabián Heredia Montiel
2023-09-12 16:20:15 -05:00
committed by GitHub
+4 -14
View File
@@ -32,15 +32,6 @@ in {
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`
@@ -62,6 +53,10 @@ in {
};
};
imports = [
(lib.mkRemovedOptionModule ["programs" "direnv" "persistDerivations"] "persistDerivations was removed as it is on longer necessary")
];
config = lib.mkIf cfg.enable {
programs = {
@@ -87,11 +82,6 @@ in {
'';
};
nix.settings = lib.mkIf cfg.persistDerivations {
keep-outputs = true;
keep-derivations = true;
};
environment = {
systemPackages =
if cfg.loadInNixShell then [cfg.package]