Skip to content

vimPlugins.vim-instant-markdown: init at 2019-09-06#78579

Closed
iv-nn wants to merge 3 commits intoNixOS:masterfrom
iv-nn:vim-instant-markdown
Closed

vimPlugins.vim-instant-markdown: init at 2019-09-06#78579
iv-nn wants to merge 3 commits intoNixOS:masterfrom
iv-nn:vim-instant-markdown

Conversation

@iv-nn
Copy link
Contributor

@iv-nn iv-nn commented Jan 26, 2020

Motivation for this change

Add vim-instant-markdown plugin.

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

@iv-nn iv-nn requested a review from jonringer as a code owner January 26, 2020 22:10
@ofborg ofborg bot added 6.topic: vim Advanced text editor 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jan 26, 2020
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.

this looks like an addition of a node package, and usage of said package in a vim module. The commit history should look like:

nodePackages.instant-markdown-d: init at XXXXX
vimPlugins: update
vimPlugins.vim-instant-markdown: init at 2019-09-06

@iv-nn iv-nn force-pushed the vim-instant-markdown branch from 07015f5 to 743aaed Compare January 28, 2020 11:11
@ofborg ofborg bot requested review from jagajaga and jorsn January 28, 2020 15:39
@ofborg ofborg bot added 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. and removed 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jan 28, 2020
@iv-nn iv-nn force-pushed the vim-instant-markdown branch from 743aaed to 4df4919 Compare February 21, 2020 12:08
@iv-nn
Copy link
Contributor Author

iv-nn commented Feb 21, 2020

I just rebased to fix conflicts.

@ofborg ofborg bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. and removed 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Feb 21, 2020
@jonringer
Copy link
Contributor

I just merged another big PR, do you mind rebasing again

@iv-nn iv-nn force-pushed the vim-instant-markdown branch from 4df4919 to 338154d Compare February 24, 2020 09:30
@iv-nn
Copy link
Contributor Author

iv-nn commented Feb 24, 2020

Done.

@iv-nn iv-nn force-pushed the vim-instant-markdown branch from 338154d to f058745 Compare February 28, 2020 22:50
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is weird and might be related to #70974 or #81275.

@jonringer
Copy link
Contributor

@GrahamcOfBorg eval

@iv-nn iv-nn force-pushed the vim-instant-markdown branch from f058745 to 93b4f2a Compare May 22, 2020 13:45
@iv-nn
Copy link
Contributor Author

iv-nn commented May 22, 2020

I finally got to rebase it, had issue with the node packages generate.sh script and then with github rate limiting when running vim plugins update.py (until I noticed the new --proc option).

@ofborg ofborg bot added 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. and removed 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels May 22, 2020
@prusnak
Copy link
Member

prusnak commented May 30, 2020

Please rework your PR. It now has a merge conflict after PR #89184 has been merged

@prusnak prusnak added 2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment labels May 30, 2020
@iv-nn iv-nn force-pushed the vim-instant-markdown branch from 93b4f2a to 473cad4 Compare June 9, 2020 11:20
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 9, 2020
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Jun 9, 2020
@iv-nn iv-nn force-pushed the vim-instant-markdown branch from 473cad4 to e92d651 Compare June 14, 2020 10:15
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. labels Jun 14, 2020
@ryantm ryantm added 2.status: merge conflict This PR has merge conflicts with the target branch and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Oct 3, 2020
@cideM
Copy link
Contributor

cideM commented Jan 9, 2021

@iv-nn It's a hassle with the constant merge conflicts :( but are you still available for seeing this through to the end 🚀 ? Otherwise I'd just pick it up

@jonringer
Copy link
Contributor

usually the conflicts aren't too bad with vim plugins, but they are horrendous with node, as it needs to re-make the entire node world.

@iv-nn
Copy link
Contributor Author

iv-nn commented Jan 16, 2021

I tried to rebase and run generate.sh but then I've changes in node-env.nix, utillinux is renamed to util-linux going against bc49a08. I'm not sure what to do.

@stale
Copy link

stale bot commented Jul 16, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 16, 2021
@teto
Copy link
Member

teto commented Dec 2, 2021

@iv-nn place yourself on top of master, cherry-pick the code that hasn't changed and redo what you've done the first time. I can try to merge it quick if that works fine.

@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Dec 2, 2021
@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 19, 2022
@teto
Copy link
Member

teto commented Jul 8, 2022

feel free to reopen when rebasing/updating the PR

@teto teto closed this Jul 8, 2022
@iv-nn iv-nn deleted the vim-instant-markdown branch July 25, 2024 12:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 6.topic: vim Advanced text editor 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants