Unverified Commit 7ef47328 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #325275 from GaetanLepage/tinymist 

tinymist: 0.11.13 -> 0.11.14
parents 03212cdc eb930b09

pkgs/applications/editors/vscode/extensions/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -3040,8 +3040,6 @@ let 
        };

      };



      mgt19937.typst-preview = callPackage ./mgt19937.typst-preview { };



      mhutchie.git-graph = buildVscodeMarketplaceExtension {

        mktplcRef = {

          name = "git-graph";
@@ -5364,6 +5362,7 @@ let 
    jakebecker.elixir-ls = throw "jakebecker.elixir-ls is deprecated in favor of elixir-lsp.vscode-elixir-ls"; # Added 2024-05-29

    jpoissonnier.vscode-styled-components = throw "jpoissonnier.vscode-styled-components is deprecated in favor of styled-components.vscode-styled-components"; # Added 2024-05-29

    matklad.rust-analyzer = throw "matklad.rust-analyzer is deprecated in favor of rust-lang.rust-analyzer"; # Added 2024-05-29

    mgt19937.typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07

    ms-vscode.go = throw "ms-vscode.go is deprecated in favor of golang.go"; # Added 2024-05-29

    ms-vscode.PowerShell = throw "ms-vscode.PowerShell is deprecated in favor of super.ms-vscode.powershell"; # Added 2024-05-29

    rioj7.commandOnAllFiles = throw "rioj7.commandOnAllFiles is deprecated in favor of rioj7.commandonallfiles"; # Added 2024-05-29

pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
# Keep pkgs/by-name/ty/typst-preview/package.nix in sync with this extension



{

  vscode-utils,

  lib,

  jq,

  moreutils,

  typst-preview,

}:



vscode-utils.buildVscodeMarketplaceExtension {

  mktplcRef = {

    name = "typst-preview";

    publisher = "mgt19937";

    version = "0.11.7";

    hash = "sha256-70dVGoSBDKCtvn7xiC/gAh4OQ8nNDiI/M900r2zlOfU=";

  };



  buildInputs = [ typst-preview ];



  nativeBuildInputs = [

    jq

    moreutils

  ];



  postInstall = ''

    cd "$out/$installPrefix"

    jq '.contributes.configuration.properties."typst-preview.executable".default = "${lib.getExe typst-preview}"' package.json | sponge package.json

  '';



  meta = {

    description = "Typst Preview is an extension for previewing your Typst files in vscode instantly";

    downloadPage = "https://marketplace.visualstudio.com/items?itemName=mgt19937.typst-preview";

    homepage = "https://github.com/Enter-tainer/typst-preview-vscode";

    license = lib.licenses.mit;

    maintainers = [ lib.maintainers.drupol ];

  };

}

pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { 
    name = "tinymist";

    publisher = "myriad-dreamin";

    inherit (tinymist) version;

    hash = "sha256-rRopyjZsQ3N/qPE/r+0ZLfNqcYYMrcY124H3kSx4loE=";

    hash = "sha256-e/7HAvaohATDet7ynYc34e5cbOzBL5Rcjvimggs68c4=";

  };



  nativeBuildInputs = [

pkgs/by-name/ti/tinymist/Cargo.lock

+12 −12
Original line number Diff line number Diff line
@@ -3697,7 +3697,7 @@ dependencies = [ 


[[package]]

name = "sync-lsp"

version = "0.11.13"

version = "0.11.14"

dependencies = [

 "anyhow",

 "clap",
@@ -3836,7 +3836,7 @@ dependencies = [ 


[[package]]

name = "tests"

version = "0.11.13"

version = "0.11.14"

dependencies = [

 "insta",

 "lsp-server",
@@ -3933,7 +3933,7 @@ dependencies = [ 


[[package]]

name = "tinymist"

version = "0.11.13"

version = "0.11.14"

dependencies = [

 "anyhow",

 "async-trait",
@@ -3967,7 +3967,7 @@ dependencies = [ 
 "serde",

 "serde_json",

 "sync-lsp",

 "tinymist-assets 0.11.12",

 "tinymist-assets 0.11.14 (registry+https://github.com/rust-lang/crates.io-index)",

 "tinymist-query",

 "tinymist-render",

 "tokio",
@@ -3994,17 +3994,17 @@ dependencies = [ 


[[package]]

name = "tinymist-assets"

version = "0.11.12"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e51823bcf79f6ae1d0a1eb75c26cd9139cc062b7e2ae4f12077e5fb30b6aafa5"

version = "0.11.14"



[[package]]

name = "tinymist-assets"

version = "0.11.13"

version = "0.11.14"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e4e5159484d14f149de53df7cf5f04d9cff4a4d414688cc0cc81910162d74892"



[[package]]

name = "tinymist-query"

version = "0.11.13"

version = "0.11.14"

dependencies = [

 "anyhow",

 "biblatex",
@@ -4050,7 +4050,7 @@ dependencies = [ 


[[package]]

name = "tinymist-render"

version = "0.11.13"

version = "0.11.14"

dependencies = [

 "base64 0.22.1",

 "log",
@@ -4428,7 +4428,7 @@ dependencies = [ 


[[package]]

name = "typst-preview"

version = "0.11.13"

version = "0.11.14"

dependencies = [

 "await-tree",

 "clap",
@@ -4440,7 +4440,7 @@ dependencies = [ 
 "once_cell",

 "serde",

 "serde_json",

 "tinymist-assets 0.11.12",

 "tinymist-assets 0.11.14 (registry+https://github.com/rust-lang/crates.io-index)",

 "tokio",

 "tokio-tungstenite",

 "typst",

pkgs/by-name/ti/tinymist/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ rustPlatform.buildRustPackage rec { 
  pname = "tinymist";

  # Please update the corresponding vscode extension when updating

  # this derivation.

  version = "0.11.13";

  version = "0.11.14";



  src = fetchFromGitHub {

    owner = "Myriad-Dreamin";

    repo = "tinymist";

    rev = "refs/tags/v${version}";

    hash = "sha256-aAeDeW1EiF8NqsIAQ39RaTHq6wC39QeMptvwTJ3/ZWc=";

    hash = "sha256-6dUI0w9GKubK2hVK8fOkAYoUdEII9umPEZZ6uSh7XjE=";

  };



  cargoLock = {