3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #69130 from millerjason/add-vimacs

vimacs: init at 2016-03-24
This commit is contained in:
Timo Kaufmann 2020-03-27 19:14:42 +00:00 committed by GitHub
commit c4f97342ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 69 additions and 0 deletions

View file

@ -4878,6 +4878,12 @@
githubId = 19479662;
name = "Kajetan Champlewski";
};
millerjason = {
email = "mailings-github@millerjason.com";
github = "millerjason";
githubId = 7610974;
name = "Jason Miller";
};
miltador = {
email = "miltador@yandex.ua";
name = "Vasiliy Solovey";

View file

@ -0,0 +1,34 @@
{ stdenv, config, vim_configurable, macvim, vimPlugins
, useMacvim ? stdenv.isDarwin && (config.vimacs.macvim or true)
, vimacsExtraArgs ? "" }:
stdenv.mkDerivation rec {
pname = "vimacs";
version = vimPackage.version;
vimPackage = if useMacvim then macvim else vim_configurable;
buildInputs = [ vimPackage vimPlugins.vimacs ];
buildCommand = ''
mkdir -p "$out"/bin
cp "${vimPlugins.vimacs}"/share/vim-plugins/vimacs/bin/vim $out/bin/vimacs
substituteInPlace "$out"/bin/vimacs \
--replace '-vim}' '-@bin@/bin/vim}' \
--replace '-gvim}' '-@bin@/bin/vim -g}' \
--replace '--cmd "let g:VM_Enabled = 1"' \
'--cmd "let g:VM_Enabled = 1" --cmd "set rtp^=@rtp@" ${vimacsExtraArgs}' \
--replace @rtp@ ${vimPlugins.vimacs.rtp} \
--replace @bin@ ${vimPackage}
for prog in vm gvm gvimacs vmdiff vimacsdiff
do
ln -s "$out"/bin/vimacs $out/bin/$prog
done
'';
meta = with stdenv.lib; {
description = "Vim-Improved eMACS: Emacs emulation for Vim";
homepage = "http://algorithm.com.au/code/vimacs";
license = licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ millerjason ];
};
}

View file

@ -5888,6 +5888,17 @@ let
};
};
vimacs = buildVimPluginFrom2Nix {
pname = "vimacs";
version = "2016-03-24";
src = fetchFromGitHub {
owner = "andrep";
repo = "vimacs";
rev = "7b8e297722d55089f0f0535fe6422533c98112fb";
sha256 = "0x92jcpdlvxhhdpwkv7ig9ya7s96yqjy6ms9xnx8djkf12xql16f";
};
};
vimagit = buildVimPluginFrom2Nix {
pname = "vimagit";
version = "2020-01-12";

View file

@ -460,6 +460,21 @@ self: super: {
};
});
vimacs = super.vimacs.overrideAttrs(old: {
buildPhase = ''
substituteInPlace bin/vim \
--replace '/usr/bin/vim' 'vim' \
--replace '/usr/bin/gvim' 'gvim'
# remove unnecessary duplicated bin wrapper script
rm -r plugin/vimacs
'';
meta = with stdenv.lib; {
description = "Vim-Improved eMACS: Emacs emulation plugin for Vim";
homepage = "http://algorithm.com.au/code/vimacs";
license = licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ millerjason ];
};
});
vimshell-vim = super.vimshell-vim.overrideAttrs(old: {
dependencies = with super; [ vimproc-vim ];

View file

@ -9,6 +9,7 @@ alvan/vim-closetag
alx741/vim-hindent
alx741/vim-stylishask
amiorin/ctrlp-z
andrep/vimacs
andreshazard/vim-logreview
andsild/peskcolor.vim
andviro/flake8-vim

View file

@ -22447,6 +22447,8 @@ in
gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3;
});
vimacs = callPackage ../applications/editors/vim/vimacs.nix { };
qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {};
qtile = callPackage ../applications/window-managers/qtile {