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.

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

vimPlugins.neuron-vim: ihsanturk/neuron.vim -> fiatjaf/neuron.vim #101385

Merged
merged 1 commit into from Nov 6, 2020
Merged

vimPlugins.neuron-vim: ihsanturk/neuron.vim -> fiatjaf/neuron.vim #101385

merged 1 commit into from Nov 6, 2020

Conversation

wbadart
Copy link
Contributor

@wbadart wbadart commented Oct 22, 2020 •
edited

Motivation for this change

The current derivation for vimPlugins.neuron-vim points to ihsanturk/neuron.vim, which doesn't seem to be actively maintained. This PR switches over to an actively maintained fork, fiatjaf/neuron.vim, which works with recent versions of neuron.

Things done

First I removed the original ihsanturk/neuron.vim from vim-plugin-names. Then I ran the update script like so:

./update.py --add fiatjaf/neuron.vim
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@wbadart wbadart mentioned this pull request Oct 22, 2020
Closed
@ofborg ofborg bot added the 6.topic: vim label Oct 22, 2020
@ofborg ofborg bot requested review from jagajaga and jorsn October 22, 2020 15:05
@wbadart
Copy link
Contributor Author

wbadart commented Oct 27, 2020 •
edited

hey @SuperSandro2000, I think you'll find that the commits are a little better organized now. The first one, 6ec7ee1f8769bb6c0a91038ae4d0a125af7906a8, just contains the results of update.py with no modifications to the plugin list. The next one, 4df3812, is the result of update.py --add fiatjaf/neuron.vim and only includes the addition to the generated nix expression and vim-plugin-names list. Finally, b628bb8 de-dupes the neuron-vim entry by removing the unmaintained plugin from the plugin list and generated nix expression.

@wbadart
Copy link
Contributor Author

wbadart commented Oct 30, 2020

Conflict arose with the base; just fixed that.

@wbadart
Copy link
Contributor Author

wbadart commented Nov 5, 2020

Hey team, any further blockers?

/cc @SuperSandro2000 @jonringer

jonringer
jonringer reviewed Nov 5, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment •
edited

Choose a reason for hiding this comment

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

do you mind squashing, and rebasing. This should only be one commit

Please follow CONTRIBUTING.md and manual#submitting-changes-making-patches and squash the fix-up commits.

git rebase -i is a great tool for this, I created a small video demonstrating it's use here. A more indepth text tutorial can be found here

@primeos @wbadart
vimPlugins.neuron-vim: ihsanturk/neuron.vim -> fiatjaf/neuron.vim
f767fd3 
The current derivation for `vimPlugins.neuron-vim` points to
[ihsanturk/neuron.vim], which doesn't seem to be actively maintained.
This PR switches over to an actively maintained fork,
[fiatjaf/neuron.vim], which works with recent versions of [neuron].

[ihsanturk/neuron.vim]: https://github.com/ihsanturk/neuron.vim
[fiatjaf/neuron.vim]: https://github.com/fiatjaf/neuron.vim
[neuron]: https://github.com/srid/neuron
@wbadart
Copy link
Contributor Author

wbadart commented Nov 6, 2020

You got it, thanks Jonathan. I had originally spread it out because I was following the vim plugin-specific instructions (using update.py). I just rebased so this should hopefully be more in line with the broader contributing policy!

jpotier
jpotier approved these changes Nov 6, 2020
View reviewed changes
pkgs/misc/vim-plugins/generated.nix Show resolved Hide resolved
jonringer
jonringer approved these changes Nov 6, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

Result of nixpkgs-review pr 101385 1

1 package built:
  • vimPlugins.neuron-vim

@jonringer jonringer merged commit a3ca152 into NixOS:master Nov 6, 2020
@primeos
Copy link
Member

primeos commented Nov 6, 2020

@wbadart you somehow managed to make me the commit author in your last force-push... :o xD

@wbadart
Copy link
Contributor Author

wbadart commented Nov 6, 2020

Git is truly an enigma sometimes :) Welcome to the thread, I guess!

@wbadart wbadart mentioned this pull request Nov 13, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@jpotier jpotier jpotier approved these changes

@jonringer jonringer jonringer approved these changes

@jagajaga jagajaga Awaiting requested review from jagajaga

@jorsn jorsn Awaiting requested review from jorsn

Assignees
No one assigned
Labels
6.topic: vim 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@wbadart @primeos @jpotier @SuperSandro2000 @jonringer @Janik-Haag