Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Update error-parser for nix-instantiate on Nix 2.4+ #3227

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jan 25, 2021
Merged

Update error-parser for nix-instantiate on Nix 2.4+ #3227

merged 1 commit into from
Jan 25, 2021

Conversation

@Ma27
Copy link
Contributor

@Ma27 Ma27 commented Jul 6, 2020 •
edited
Loading

In the (unreleased) Nix 2.4 the error-messages have been reformatted[1].
This patch aims to retain proper .nix-support in ale, for both
stable Nix (2.3 and older) and unstable Nix (2.4 and newer).

[1] NixOS/nix#3590

@Ma27 Ma27 force-pushed the nixunstable-error-fmt branch from d85e01e to d2c83ef Compare July 22, 2020 06:49
@Ma27 Ma27 marked this pull request as draft July 22, 2020 06:50
@Ma27 Ma27 force-pushed the nixunstable-error-fmt branch from d2c83ef to 337bd5b Compare July 22, 2020 14:17
@stale
Copy link

stale bot commented Aug 20, 2020

This pull request has been automatically marked as stale because it has not been updated recently. Make sure to write tests and document your changes. See :help ale-dev for information on writing tests.
If your pull request is good to merge, bother w0rp or another maintainer again, and get them to merge it.

@stale stale bot added the stale PRs/Issues no longer valid label Aug 20, 2020
@Ma27
Copy link
Contributor Author

Ma27 commented Aug 20, 2020

Well, it's still WIP unfortunately as the relevant PR in Nix must be merged.

@stale stale bot removed the stale PRs/Issues no longer valid label Aug 20, 2020
@stale
Copy link

stale bot commented Sep 25, 2020

This pull request has been automatically marked as stale because it has not been updated recently. Make sure to write tests and document your changes. See :help ale-dev for information on writing tests.
If your pull request is good to merge, bother w0rp or another maintainer again, and get them to merge it.

@stale stale bot added the stale PRs/Issues no longer valid label Sep 25, 2020
@Ma27 Ma27 changed the title Update error-parser for nix-instantiate on Nix 2.4 Update error-parser for nix-instantiate on Nix 3.0 Sep 25, 2020
@stale stale bot removed the stale PRs/Issues no longer valid label Sep 25, 2020
@Ma27 Ma27 marked this pull request as ready for review September 25, 2020 09:21
@Ma27 Ma27 force-pushed the nixunstable-error-fmt branch from 337bd5b to 8acb29c Compare September 27, 2020 20:34
@stale
Copy link

stale bot commented Oct 25, 2020

This pull request has been automatically marked as stale because it has not been updated recently. Make sure to write tests and document your changes. See :help ale-dev for information on writing tests.
If your pull request is good to merge, bother w0rp or another maintainer again, and get them to merge it.

@stale stale bot added the stale PRs/Issues no longer valid label Oct 25, 2020
@Ma27
Copy link
Contributor Author

Ma27 commented Oct 25, 2020

Note to self: we probably need an improved version supporting both Nix 2.3 and 3.0 as a 3.0 release is not in sight. With that being implemented, this PR should be mergeable.

@stale stale bot removed the stale PRs/Issues no longer valid label Oct 25, 2020
@Ma27 Ma27 force-pushed the nixunstable-error-fmt branch from 8acb29c to 990802b Compare October 26, 2020 12:39
@Ma27 Ma27 mentioned this pull request Oct 26, 2020
Closed
@Ma27 Ma27 changed the title Update error-parser for nix-instantiate on Nix 3.0 Update error-parser for nix-instantiate on Nix 2.4+ Oct 26, 2020
@Ma27
Copy link
Contributor Author

Ma27 commented Oct 28, 2020

cc @w0rp @hsanson this should be reviewable now btw :)

@Ma27 Ma27 force-pushed the nixunstable-error-fmt branch from 990802b to 9db6c0b Compare November 8, 2020 16:14
@Ma27
Copy link
Contributor Author

Ma27 commented Nov 29, 2020

cc @hsanson @w0rp anything tbd to get this merged? :)

@stale
Copy link

stale bot commented Dec 27, 2020

This pull request has been automatically marked as stale because it has not been updated recently. Make sure to write tests and document your changes. See :help ale-dev for information on writing tests.
If your pull request is good to merge, bother w0rp or another maintainer again, and get them to merge it.

@stale stale bot added the stale PRs/Issues no longer valid label Dec 27, 2020
@Ma27
Copy link
Contributor Author

Ma27 commented Dec 27, 2020

cc @w0rp would you mind having a look? :)

@stale stale bot removed the stale PRs/Issues no longer valid label Dec 27, 2020
hsanson
hsanson requested changes Jan 20, 2021
View reviewed changes
@hsanson
Copy link
Contributor

hsanson commented Jan 22, 2021

ALE migrated from Travis to Github Actions (see #3548) so it is necessary to rebase this PR from latest master branch to trigger the required checks.

# Add dense-analysis as remote upstream on your local fork. Not 
# needed if already added.
git remote add upstream https://github.com/dense-analysis/ale.git

# Sync your local master with upstream master
git checkout master
git fetch upstream master
git merge upstream/master

# Rebase the PR branch with master
git checkout my-branch-name
git rebase master   # Fix any conflicts you may have

# Force push the updated PR branch to origin to trigger the checks
git push -f origin my-branch-name

@Ma27 Ma27 force-pushed the nixunstable-error-fmt branch from 9db6c0b to f8f253f Compare January 22, 2021 16:55
@Ma27 Ma27 force-pushed the nixunstable-error-fmt branch from f8f253f to aa9629c Compare January 23, 2021 16:27
hsanson
hsanson requested changes Jan 24, 2021
View reviewed changes
@Ma27
Update error-parser for nix-instantiate on Nix 2.4+
72dbd7f 
In the (unreleased) Nix 2.4 the error-messages have been reformatted[1].
This patch aims to retain proper `.nix`-support in `ale`, for both
stable Nix (2.3 and older) and unstable Nix (2.4 and newer).

[1] NixOS/nix#3590
@Ma27 Ma27 force-pushed the nixunstable-error-fmt branch from aa9629c to 72dbd7f Compare January 24, 2021 21:54
hsanson
hsanson approved these changes Jan 25, 2021
View reviewed changes
Copy link
Contributor

@hsanson hsanson left a comment

Choose a reason for hiding this comment

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

Looks good, thanks.

@hsanson hsanson merged commit 3a17282 into dense-analysis:master Jan 25, 2021
@Ma27 Ma27 deleted the nixunstable-error-fmt branch January 25, 2021 07:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hsanson hsanson hsanson approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Ma27 @hsanson