Skip to content
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

helix: change wrapping when adding extraPackages to suffix #5208

Merged
merged 1 commit into from
Nov 10, 2024

Conversation

mrnossiom
Copy link
Contributor

Description

This makes extraPackages the default, but they do not shadow the env.

So you can still have packages (e.g. LSPs) with a different version than the global one in you local env like nix's shells.

Checklist

  • Change is backwards compatible.

    I guess this is not really backwards compatible but to me this is the expected behaviour. This PR is there to discuss my point.

  • 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.

    I checked and it seems there is no test to update. I'm not sure adding a test is necessary.

  • Commit messages are formatted like

    {component}: {description}
    
    {long description}
    

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

@Philipp-M

Copy link
Contributor

@Philipp-M Philipp-M left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mrnossiom mrnossiom force-pushed the fix/helix-wrap-with-suffix branch from baf2dd9 to f9de4c0 Compare April 1, 2024 15:29
@mrnossiom mrnossiom changed the title fix: change helix wrapping when adding extraPackages to suffix helix: change wrapping when adding extraPackages to suffix Apr 1, 2024
@nyabinary
Copy link

Does this fix #4750 ?

@mrnossiom
Copy link
Contributor Author

I would say that yes, It does

@mrnossiom mrnossiom requested a review from Philipp-M July 15, 2024 09:05
@Philipp-M
Copy link
Contributor

I don't have merge rights (and approved already), so maybe @rycee ?

Copy link

stale bot commented Oct 30, 2024

Thank you for your contribution! I marked this pull request as stale due to inactivity. Please read the relevant sections below before commenting.

If you are the original author of the PR

  • GitHub sometimes doesn't notify people who commented / reviewed a PR previously when you (force) push commits. If you have addressed the reviews you can officially ask for a review from those who commented to you or anyone else.
  • If it is unfinished but you plan to finish it, please mark it as a draft.
  • If you don't expect to work on it any time soon, please consider closing it with a short comment encouraging someone else to pick up your work.
  • To get things rolling again, rebase the PR against the target branch and address valid comments.

If you are not the original author of the PR

  • If you want to pick up the work on this PR, please create a new PR and indicate that it supercedes and closes this PR.

@stale stale bot added the status: stale label Oct 30, 2024
this makes extraPackages the default, but they do not shadow the env
so you can still have packages (e.g. LSPs) with a different version
than the global one in you local env like nix's shells.
@mrnossiom mrnossiom force-pushed the fix/helix-wrap-with-suffix branch from f9de4c0 to 382ea19 Compare October 30, 2024 17:54
@mrnossiom
Copy link
Contributor Author

I just rebased. This is still ready to merge.

@rycee rycee merged commit 60bb110 into nix-community:master Nov 10, 2024
3 checks passed
@rycee
Copy link
Member

rycee commented Nov 10, 2024

Thanks! Merged to master now 🙂

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants