diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 4ecfa222de74de..83b413e68a5fa7 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2591,6 +2591,17 @@ let meta.homepage = "https://github.com/norcalli/nvim-terminal.lua/"; }; + nvim-typescript = buildVimPluginFrom2Nix { + pname = "nvim-typescript"; + version = "2020-06-06"; + src = fetchFromGitHub { + owner = "mhartington"; + repo = "nvim-typescript"; + rev = "cb325b5273e1eba4e8536fdf211a4d7e49b5d6f9"; + sha256 = "0bbbj25jhdx0ls2d7p9ir54hmdxvql9kn3hid1s4h963ww1mah0j"; + }; + }; + nvim-yarp = buildVimPluginFrom2Nix { pname = "nvim-yarp"; version = "2020-04-08"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 73c5690b192715..d2ff6883637b98 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -1,5 +1,5 @@ { lib, stdenv -, python, cmake, meson, vim, ruby +, python, cmake, meson, vim, ruby, callPackage, runCommand , which, fetchFromGitHub, fetchgit, fetchurl, fetchzip, fetchpatch , llvmPackages, rustPlatform , xkb-switch, fzf, skim, stylish-haskell @@ -10,7 +10,7 @@ , languagetool , Cocoa, CoreFoundation, CoreServices , buildVimPluginFrom2Nix -, nodePackages +, nodePackages, nodejs , dasht # coc-go dependency @@ -711,6 +711,35 @@ self: super: { dependencies = with super; [ bclose-vim ]; }); + nvim-typescript = let + # node2nix dynamically resolves nodeDependencies + nvim-typescript-deps = (callPackage ( + runCommand "nvim-typescript-rplugin.nix" { + buildInputs = [ nodePackages.node2nix ]; + } '' + mkdir -p $out + cd ${super.nvim-typescript.src}/rplugin/node/nvim_typescript + node2nix --input package.json \ + --lock package-lock.json \ + --include-peer-dependencies \ + --nodejs-10 \ + --development \ + --output $out/node-packages.nix \ + --node-env $out/node-env.nix \ + --composition $out/default.nix + '' + ) {}); + in + super.nvim-typescript.overrideAttrs(old: { + buildInputs = [ nodejs ]; + buildPhase = '' + pushd rplugin/node/nvim_typescript + cp -r ${nvim-typescript-deps.shell.nodeDependencies}/lib/node_modules node_modules + npm run build + popd + ''; + }); + vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: { postPatch = old.postPatch or "" + '' substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace \ diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index e22ddc50ddd1dd..7ec23053958898 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -282,6 +282,7 @@ megaannum/self mengelbrecht/lightline-bufferline mfukar/robotframework-vim mg979/vim-visual-multi +mhartington/nvim-typescript mhinz/vim-grepper mhinz/vim-janah mhinz/vim-sayonara