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

Add additional vim plugins #96044

Closed
wants to merge 7 commits into from
Closed

Add additional vim plugins #96044

wants to merge 7 commits into from

Conversation

RonanMacF
Copy link
Contributor

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

@jonringer
Copy link
Contributor

jonringer commented Aug 23, 2020 •
edited

markbar is failing, I created Yilin-Yang/vim-markbar#23 to fix it.

builder for '/nix/store/1rx1hdsw7mpig83x1ndqkfgr9afmarky-vimplugin-vim-markbar-2020-05-10.drv' failed with exit code 1; last 10 log lines:
  unpacking sources
  unpacking source archive /nix/store/qfl0s4jazv3ar4whrxzqjvvbgy100qfp-source
  source root is source
  patching sources
  configuring
  building
  installing
  Building help tags
  Error detected while processing command line:
  E154: Duplicate tag "g:markbar_foldopen" in file /nix/store/1xvh545n22z6x4amsa1824jiy0girh09-vimplugin-vim-markbar-2020-05-10/share/vim-plugins/vim-markbar/doc/vim-markbar.txtFailed to build help tags!
cannot build derivation '/nix/store/xpgyqpxzyrnvnr7k3001fj1xf8d1v2zw-env.drv': 1 dependencies couldn't be built
[5 built (1 failed), 0.0 MiB DL]
error: build of '/nix/store/xpgyqpxzyrnvnr7k3001fj1xf8d1v2zw-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/96044
1 package failed to build:
vimPlugins.vim-markbar

2 packages built:
vimPlugins.vim-merginal vimPlugins.vim-twiggy

@jonringer
Copy link
Contributor

there's some merge conficts, do you mind rebasing?

Also, if we don't want to wait for upstream to merge my PR, you can add it as a patch in overrides.nix

@RonanMacF
Copy link
Contributor Author

Cheers for looking into that Jon, i'll keep an eye on the PR on markbar and once it merges i'll rebase and push again! Thanks for the follow up

@jonringer
Copy link
Contributor

you should be able to update and have it work fine.

@RonanMacF
Copy link
Contributor Author

Should be good to go now!

@jonringer
Copy link
Contributor

for git history, do you mind doing git pull -r instead of merging :)

or use git rebase -i, drop the update and merge commits, then do a new update :)

@RonanMacF
Copy link
Contributor Author

Think that should be good to now.

@jonringer
Copy link
Contributor

changes were included in #96862

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer Awaiting requested review from jonringer

Assignees
No one assigned
Labels
2.status: merge conflict 6.topic: vim 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@RonanMacF @jonringer