Skip to content

firefox, thunderbird: conditional search file#5970

Merged
rycee merged 3 commits intonix-community:masterfrom
khaneliman:firefox
Oct 18, 2024
Merged

firefox, thunderbird: conditional search file#5970
rycee merged 3 commits intonix-community:masterfrom
khaneliman:firefox

Conversation

@khaneliman
Copy link
Copy Markdown
Collaborator

@khaneliman khaneliman commented Oct 17, 2024

Description

When using multiple profiles that share the same path we still try to evaluate the file even when search customization isn't enabled.
Follow up to #5697 (comment) to only evaluate when the profile wants a search.json.mozlz4 file generated.

Checklist

  • Change is backwards compatible.

  • Code formatted with ./format.

  • Code tested through nix-shell --pure tests -A run.all or nix develop --ignore-environment .#all using Flakes.

  • Test cases updated/added. See example.

  • Commit messages are formatted like

    {component}: {description}
    
    {long description}
    

    See CONTRIBUTING for more information and recent commit messages for examples.

  • If this PR adds a new module

    • Added myself as module maintainer. See example.

Maintainer CC

@teto @rycee @kira-bruneau

@khaneliman khaneliman changed the title firefox: conditional search file firefox, thunderbird: conditional search file Oct 17, 2024
@github-actions github-actions bot added the mail HM email accounts, thunderbird, alot, notmuch, msmtp, meli... label Oct 17, 2024
@khaneliman
Copy link
Copy Markdown
Collaborator Author

khaneliman commented Oct 17, 2024

I can try and add a test for this scenario, too. Just wanted to unblock my flake building.

@khaneliman
Copy link
Copy Markdown
Collaborator Author

Alright, added a test to firefox for the shared path. Verified it throws error without the change and with the change the test passes.

@khaneliman
Copy link
Copy Markdown
Collaborator Author

khaneliman commented Oct 17, 2024

Looks like unrelated test failure due to recent neovim PR

neovim-plugin-config: FAILED
Expected /build/tmp.MOi8v4T8TN to contain HM_PLUGINS_CONFIG but it did not.
For further reference please introspect /nix/store/plnzfy7m2c97v07szi1z9w157mhvc54f-nmt-report-neovim-plugin-config

EDIT: I Think @teto is working on it with #5964

@khaneliman
Copy link
Copy Markdown
Collaborator Author

Rebased and should be good now.

Used to make sure that profiles that share a common generated path still
build properly.
@rycee rycee merged commit 346973b into nix-community:master Oct 18, 2024
@rycee
Copy link
Copy Markdown
Member

rycee commented Oct 18, 2024

Thanks! Merged to master now 🙂

@teto
Copy link
Copy Markdown
Collaborator

teto commented Oct 18, 2024

thanks for the fix.

Looks like unrelated test failure due to recent neovim NixOS/nixpkgs#344541

It's annoying that the tests are not run against the flake nixpkgs, it means we cant provide lockstep updates and any nixos-unstable bump can break HM's CI/configs

@khaneliman khaneliman deleted the firefox branch October 18, 2024 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

mail HM email accounts, thunderbird, alot, notmuch, msmtp, meli...

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants