From 5ea8c3f4a89d2c8a2d584224d23f88146039ed4f Mon Sep 17 00:00:00 2001 From: "\"347Online | Katie Janzen\"" <"katiejanzen@347online.me"> Date: Thu, 21 Nov 2024 02:22:44 -0600 Subject: [PATCH 1/2] vimPlugins.tsc-nvim: init at 2024-08-14 --- pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 9e97c5921e817..63589b260302d 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1064,6 +1064,7 @@ https://github.com/folke/trouble.nvim/,, https://github.com/Pocco81/true-zen.nvim/,, https://github.com/tesaguri/trust.vim/,HEAD, https://github.com/folke/ts-comments.nvim/,HEAD, +https://github.com/dmmulroy/tsc.nvim/,HEAD, https://github.com/jgdavey/tslime.vim/,, https://github.com/mtrajano/tssorter.nvim/,HEAD, https://github.com/Quramy/tsuquyomi/,, From 14eccdfa35357a568c9eed949abc8686509525bf Mon Sep 17 00:00:00 2001 From: 347Online | Katie Janzen Date: Thu, 21 Nov 2024 02:29:06 -0600 Subject: [PATCH 2/2] vimPlugins: update on 2024-11-21 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 9 +++++++++ .../vim/plugins/patches/tsc.nvim/fix-path.patch | 13 +++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 pkgs/applications/editors/vim/plugins/patches/tsc.nvim/fix-path.patch diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6974f36caa844..fa5cdaeec87fc 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -12811,6 +12811,18 @@ final: prev: meta.homepage = "https://github.com/folke/ts-comments.nvim/"; }; + tsc-nvim = buildVimPlugin { + pname = "tsc.nvim"; + version = "2024-08-14"; + src = fetchFromGitHub { + owner = "dmmulroy"; + repo = "tsc.nvim"; + rev = "82c37ebfe45d30763db6f45b54e18f1e485bb52c"; + sha256 = "14fa5w73bxpvwy3jm25mmx08l2v6c1w35ca8gc61mayxja55d4ls"; + }; + meta.homepage = "https://github.com/dmmulroy/tsc.nvim/"; + }; + tslime-vim = buildVimPlugin { pname = "tslime.vim"; version = "2020-09-09"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 4d20f448ec123..2471fd207a577 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -56,6 +56,7 @@ taskwarrior3, tmux, tup, + typescript, vim, which, xkb-switch, @@ -2602,6 +2603,14 @@ in nvimRequireCheck = "todo-comments"; }; + tsc-nvim = super.tsc-nvim.overrideAttrs { + patches = [ ./patches/tsc.nvim/fix-path.patch ]; + + postPatch = '' + substituteInPlace lua/tsc/utils.lua --replace '@tsc@' ${typescript}/bin/tsc + ''; + }; + tssorter-nvim = super.tssorter-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter ]; nvimRequireCheck = "tssorter"; diff --git a/pkgs/applications/editors/vim/plugins/patches/tsc.nvim/fix-path.patch b/pkgs/applications/editors/vim/plugins/patches/tsc.nvim/fix-path.patch new file mode 100644 index 0000000000000..a311d42e4b7d6 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/tsc.nvim/fix-path.patch @@ -0,0 +1,13 @@ +diff --git a/lua/tsc/utils.lua b/lua/tsc/utils.lua +index 6433bcb..75760f9 100644 +--- a/lua/tsc/utils.lua ++++ b/lua/tsc/utils.lua +@@ -16,7 +16,7 @@ M.find_tsc_bin = function() + return node_modules_tsc_binary + end + +- return "tsc" ++ return "@tsc@" + end + + --- @param run_mono_repo boolean