Skip to content

nixos/direnv: fix silent option #398717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2025
Merged

nixos/direnv: fix silent option #398717

merged 1 commit into from
Apr 18, 2025

Conversation

Gerg-L
Copy link
Contributor

@Gerg-L Gerg-L commented Apr 14, 2025

$DIRENV_LOG_FORMAT is currently broken see: direnv/direnv#1418

this PR fixes the silent option and adds the settings option

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 14, 2025
@khaneliman khaneliman merged commit 70f338c into NixOS:master Apr 18, 2025
27 of 31 checks passed
khaneliman added a commit to khaneliman/home-manager that referenced this pull request Apr 18, 2025
Discussion and retesting in
NixOS/nixpkgs#398717. The env variable is
actually not needed when you use the config.
khaneliman added a commit to khaneliman/home-manager that referenced this pull request Apr 18, 2025
Discussion and retesting in
NixOS/nixpkgs#398717. The env variable is
actually not needed when you use the config.
@MidAutumnMoon
Copy link
Contributor

This breaks the evaluation of nixos. PR to suggest a fix #399966

@acid-bong
Copy link
Contributor

Oh, Gerg, I found out what else you forgot: since the variables are gone, cfg.silent is no longer checked against. I'm thinking of two things:

  1. just apply the toml option instead
settings = lib.mkIf cfg.silent {
  global.log_format = "-";
};
  1. use smth from lib/modules.nix and make a warning for direnv.silent

@eclairevoyant
Copy link
Contributor

What do you mean by that? cfg.silent is in the check already.

    programs = {
      direnv.settings = lib.mkIf cfg.silent {
        global = {
          log_format = lib.mkDefault "-";
          log_filter = lib.mkDefault "^$";
        };
      };

@acid-bong
Copy link
Contributor

whoops, i'm blind, sorry for bothering 🙈

khaneliman added a commit to nix-community/home-manager that referenced this pull request Apr 21, 2025
Discussion and retesting in
NixOS/nixpkgs#398717. The env variable is
actually not needed when you use the config.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants