diff options
author | Fabián Heredia Montiel <303897+fabianhjr@users.noreply.github.com> | 2023-09-12 16:20:15 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-12 16:20:15 -0500 |
commit | 8f711593fcd72c77a9fb46c0570fe5b01c32001f (patch) | |
tree | c3c2052f594a925b8eb67534fd043c0c9b908230 /nixos/modules/programs | |
parent | e40f7390bf854088341009cd3cfb8348c7153309 (diff) | |
parent | 59e48e33c4d17e189e1bf4f551f6c83fb8748f9d (diff) |
Merge pull request #254296 from Gerg-L/direnv
nixos/direnv: remove persistDerivations
Diffstat (limited to 'nixos/modules/programs')
-rw-r--r-- | nixos/modules/programs/direnv.nix | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/nixos/modules/programs/direnv.nix b/nixos/modules/programs/direnv.nix index 53717fae11a02..1a80cb2028066 100644 --- a/nixos/modules/programs/direnv.nix +++ b/nixos/modules/programs/direnv.nix @@ -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] |