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

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

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 requested a review from jonringer as a code owner Oct 22, 2020
@wbadart
Copy link
Contributor Author

@wbadart wbadart commented Oct 27, 2020

hey @SuperSandro2000, I think you'll find that the commits are a little better organized now. The first one, 6ec7ee1, 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 wbadart commented Oct 30, 2020

Conflict arose with the base; just fixed that.

jpotier
jpotier approved these changes Nov 2, 2020
@wbadart
Copy link
Contributor Author

@wbadart wbadart commented Nov 5, 2020

Hey team, any further blockers?

/cc @SuperSandro2000 @jonringer

Copy link
Contributor

@jonringer jonringer left a comment

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

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 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!

@wbadart wbadart requested review from jonringer and jpotier Nov 6, 2020
jpotier
jpotier approved these changes Nov 6, 2020
pkgs/misc/vim-plugins/generated.nix Show resolved Hide resolved
Copy link
Contributor

@jonringer jonringer left a comment

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
18 of 19 checks passed
@primeos
Copy link
Member

@primeos 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 wbadart commented Nov 6, 2020

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

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

Successfully merging this pull request may close these issues.

None yet

5 participants