From aa39d5a614f6e19b94e5b784e78b67744221fe64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 23 Sep 2018 14:53:18 +0100 Subject: [PATCH] vim: remove legacy additional-nix-code This is a left-over from https://github.com/NixOS/nixpkgs/pull/46394 We no longer use this. --- .../vim2nix/additional-nix-code/YankRing | 1 - .../vim2nix/additional-nix-code/clang_complete | 11 ----------- .../vim2nix/additional-nix-code/clighter8 | 4 ---- .../vim2nix/additional-nix-code/command-t | 5 ----- .../vim-plugins/vim2nix/additional-nix-code/cpsm | 13 ------------- .../vim2nix/additional-nix-code/ctrlp-cmatcher | 5 ----- .../vim2nix/additional-nix-code/deoplete-go | 7 ------- .../vim2nix/additional-nix-code/ensime-vim | 1 - .../vim2nix/additional-nix-code/taglist | 6 ------ .../additional-nix-code/vim-addon-manager | 1 - .../vim2nix/additional-nix-code/vim-grammarous | 10 ---------- .../vim2nix/additional-nix-code/vim-hier | 1 - .../vim2nix/additional-nix-code/vim-isort | 4 ---- .../vim2nix/additional-nix-code/vim-wakatime | 1 - .../vim2nix/additional-nix-code/vim-xdebug | 1 - .../vim2nix/additional-nix-code/vim-xkbswitch | 5 ----- .../vim2nix/additional-nix-code/vim-yapf | 4 ---- .../vim2nix/additional-nix-code/vimproc.vim | 9 --------- .../vim2nix/additional-nix-code/youcompleteme | 16 ---------------- 19 files changed, 105 deletions(-) delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/YankRing delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clighter8 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ctrlp-cmatcher delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/deoplete-go delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/taglist delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-addon-manager delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-grammarous delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-hier delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-wakatime delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xdebug delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xkbswitch delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimproc.vim delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/YankRing b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/YankRing deleted file mode 100644 index 1776c1b91ea..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/YankRing +++ /dev/null @@ -1 +0,0 @@ - sourceRoot = "."; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete deleted file mode 100644 index ed88e08742e..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete +++ /dev/null @@ -1,11 +0,0 @@ - # In addition to the arguments you pass to your compiler, you also need to - # specify the path of the C++ std header (if you are using C++). - # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). - # The linked ruby code shows generates the required '.clang_complete' for cmake based projects - # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 - # as an alternative you can execute the following command: - # $ eval echo $(nix-instantiate --eval --expr 'with (import ) {}; clang.default_cxx_stdlib_compile') - preFixup = '' - substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ - --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'" - ''; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clighter8 b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clighter8 deleted file mode 100644 index 8965ebe2981..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clighter8 +++ /dev/null @@ -1,4 +0,0 @@ - preFixup = '' - sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc}/lib/libclang.so')|" \ - -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim - ''; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t deleted file mode 100644 index f850425cba7..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t +++ /dev/null @@ -1,5 +0,0 @@ - buildInputs = [ ruby rake ]; - buildPhase = '' - rake make - rm ruby/command-t/ext/command-t/*.o - ''; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm deleted file mode 100644 index c3a210a642d..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm +++ /dev/null @@ -1,13 +0,0 @@ - buildInputs = [ - python3 - stdenv - cmake - boost - icu - ncurses - ]; - buildPhase = '' - patchShebangs . - export PY3=ON - ./install.sh - ''; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ctrlp-cmatcher b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ctrlp-cmatcher deleted file mode 100644 index bd4a4fa989b..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ctrlp-cmatcher +++ /dev/null @@ -1,5 +0,0 @@ - buildInputs = [ python ]; - buildPhase = '' - patchShebangs . - ./install.sh - ''; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/deoplete-go b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/deoplete-go deleted file mode 100644 index 80cfd9af653..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/deoplete-go +++ /dev/null @@ -1,7 +0,0 @@ - buildInputs = [ python3 ]; - buildPhase = '' - pushd ./rplugin/python3/deoplete/ujson - python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build - popd - find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \; - ''; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim deleted file mode 100644 index e065e0db4f4..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim +++ /dev/null @@ -1 +0,0 @@ - passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ]; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/taglist b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/taglist deleted file mode 100644 index 90f6e3367a3..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/taglist +++ /dev/null @@ -1,6 +0,0 @@ - setSourceRoot = '' - export sourceRoot=taglist - mkdir taglist - mv doc taglist - mv plugin taglist - ''; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-addon-manager b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-addon-manager deleted file mode 100644 index e3d8dfb6921..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-addon-manager +++ /dev/null @@ -1 +0,0 @@ - buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-grammarous b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-grammarous deleted file mode 100644 index 66a91b619d1..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-grammarous +++ /dev/null @@ -1,10 +0,0 @@ - # use `:GrammarousCheck` to initialize checking - # In neovim, you also want to use set - # let g:grammarous#show_first_error = 1 - # see https://github.com/rhysd/vim-grammarous/issues/39 - patches = [ - (substituteAll { - src = ./patches/vim-grammarous/set_default_languagetool.patch; - inherit languagetool; - }) - ]; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-hier b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-hier deleted file mode 100644 index d1f756a99d3..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-hier +++ /dev/null @@ -1 +0,0 @@ - buildInputs = [ vim ]; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort deleted file mode 100644 index febd2185bac..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort +++ /dev/null @@ -1,4 +0,0 @@ - postPatch = '' - substituteInPlace ftplugin/python_vimisort.vim \ - --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")' - ''; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-wakatime b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-wakatime deleted file mode 100644 index 31ffa7f8ff9..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-wakatime +++ /dev/null @@ -1 +0,0 @@ - buildInputs = [ python ]; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xdebug b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xdebug deleted file mode 100644 index 62a3c22c036..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xdebug +++ /dev/null @@ -1 +0,0 @@ - postInstall = false; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xkbswitch b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xkbswitch deleted file mode 100644 index 4e73ac9a73b..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xkbswitch +++ /dev/null @@ -1,5 +0,0 @@ - patchPhase = '' - substituteInPlace plugin/xkbswitch.vim \ - --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so - ''; - buildInputs = [ xkb_switch ]; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf deleted file mode 100644 index c1eb9efefc3..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf +++ /dev/null @@ -1,4 +0,0 @@ - buildPhase = '' - substituteInPlace ftplugin/python_yapf.vim \ - --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"' - ''; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimproc.vim b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimproc.vim deleted file mode 100644 index e720559fa3d..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimproc.vim +++ /dev/null @@ -1,9 +0,0 @@ - buildInputs = [ which ]; - - buildPhase = '' - substituteInPlace autoload/vimproc.vim \ - --replace vimproc_mac.so vimproc_unix.so \ - --replace vimproc_linux64.so vimproc_unix.so \ - --replace vimproc_linux32.so vimproc_unix.so - make -f make_unix.mak - ''; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme deleted file mode 100644 index 278343dab6e..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme +++ /dev/null @@ -1,16 +0,0 @@ - buildPhase = '' - substituteInPlace plugin/youcompleteme.vim \ - --replace "'ycm_path_to_python_interpreter', '''" \ - "'ycm_path_to_python_interpreter', '${python}/bin/python'" - - rm -r third_party/ycmd - ln -s ${ycmd}/lib/ycmd third_party - ''; - - meta = { - description = "Fastest non utf-8 aware word and C completion engine for Vim"; - homepage = https://github.com/Valloric/YouCompleteMe; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [marcweber jagajaga]; - platforms = stdenv.lib.platforms.unix; - };