From 3ac536f66b80e23dbcbf9fb93127e4cc75f57cb8 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 16 Apr 2024 11:13:53 -0300 Subject: [PATCH] vscode-extensions.myriad-dreamin.tinymist: move to directory --- .../editors/vscode/extensions/default.nix | 32 +-------------- .../myriad-dreamin.tinymist/default.nix | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+), 31 deletions(-) create mode 100644 pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index b6fa8d1f08e0..806bfa95c1ca 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -16,7 +16,6 @@ , moreutils , alejandra , shfmt -, tinymist , typst-lsp , typst-preview , autoPatchelfHook @@ -3134,36 +3133,7 @@ let }; }; - myriad-dreamin.tinymist = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "tinymist"; - publisher = "myriad-dreamin"; - # Please update the corresponding binary (tinymist) when updating - # this extension. - version = "0.11.4"; - hash = "sha256-VR+vl6mctwq9oSIgnfutvPFwfGUdEco8fCOjzMvPtII="; - }; - - nativeBuildInputs = [ jq moreutils ]; - - buildInputs = [ - tinymist - ]; - - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."tinymist.serverPath".default = "${lib.getExe tinymist}"' package.json | sponge package.json - ''; - - meta = { - changelog = "https://marketplace.visualstudio.com/items/myriad-dreamin.tinymist/changelog"; - description = "A VSCode extension for providing an integration solution for Typst"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=myriad-dreamin.tinymist"; - homepage = "https://github.com/myriad-dreamin/tinymist"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.drupol ]; - }; - }; + myriad-dreamin.tinymist = callPackage ./myriad-dreamin.tinymist { }; naumovs.color-highlight = buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix new file mode 100644 index 000000000000..5e7c3f59f198 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -0,0 +1,39 @@ +{ + jq, + lib, + moreutils, + tinymist, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "tinymist"; + publisher = "myriad-dreamin"; + # Please update the corresponding binary (tinymist) when updating + # this extension. + version = "0.11.4"; + hash = "sha256-VR+vl6mctwq9oSIgnfutvPFwfGUdEco8fCOjzMvPtII="; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + buildInputs = [ tinymist ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."tinymist.serverPath".default = "${lib.getExe tinymist}"' package.json | sponge package.json + ''; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/myriad-dreamin.tinymist/changelog"; + description = "A VSCode extension for providing an integration solution for Typst"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=myriad-dreamin.tinymist"; + homepage = "https://github.com/myriad-dreamin/tinymist"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.drupol ]; + }; +}