diff options
author | Gerg-L <GregLeyda@proton.me> | 2023-09-09 17:24:43 -0400 |
---|---|---|
committer | Gerg-L <GregLeyda@proton.me> | 2023-09-09 17:24:43 -0400 |
commit | 59e48e33c4d17e189e1bf4f551f6c83fb8748f9d (patch) | |
tree | 8a5ea65bf42d2c26f0174be5430a4e604ac01f50 /nixos/modules/programs | |
parent | 859399954214fc68831a1827a58d5ad6be910363 (diff) | |
download | nixpkgs-59e48e33c4d17e189e1bf4f551f6c83fb8748f9d.tar nixpkgs-59e48e33c4d17e189e1bf4f551f6c83fb8748f9d.tar.gz nixpkgs-59e48e33c4d17e189e1bf4f551f6c83fb8748f9d.tar.bz2 nixpkgs-59e48e33c4d17e189e1bf4f551f6c83fb8748f9d.tar.lz nixpkgs-59e48e33c4d17e189e1bf4f551f6c83fb8748f9d.tar.xz nixpkgs-59e48e33c4d17e189e1bf4f551f6c83fb8748f9d.tar.zst nixpkgs-59e48e33c4d17e189e1bf4f551f6c83fb8748f9d.zip |
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 53717fae11a..1a80cb20280 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] |