Merge pull request #245441 from figsoda/typst-lsp

typst-lsp: 0.7.1 -> 0.7.2, fix license

pkgs/development/tools/language-servers/typst-lsp/default.nix

@@ -5,20 +5,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "typst-lsp";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "nvarner";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-to+M/1TcQTeojwVMuXR2moyZ0L3vhGiokJrWustF/go=";
+    hash = "sha256-z6IG0qJXzwisazR/tLq6dwsZzgzhYKh/NnKmnYySS18=";
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
       "elsa-1.8.1" = "sha256-/85IriplPxx24TE/CsvjIsve100QUZiVqS0TWgPFRbw=";
-      "svg2pdf-0.4.1" = "sha256-WeVP+yhqizpTdRfyoj2AUxFKhGvVJIIiRV0GTXkgLtQ=";
+      "svg2pdf-0.5.0" = "sha256-v/ARFI+Uw5KtLe2F3ty9u3uKkWSradRmLnD2VJ+jmSI=";
       "typst-0.5.0" = "sha256-obUe9OVQ8M7MORudQGN7zaYjUv4zjeh7XidHHmUibTA=";
     };
   };
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     description = "A brand-new language server for Typst";
     homepage = "https://github.com/nvarner/typst-lsp";
     changelog = "https://github.com/nvarner/typst-lsp/releases/tag/${src.rev}";
-    license = with licenses; [ mit ];
+    license = with licenses; [ asl20 mit ];
     maintainers = with maintainers; [ figsoda GaetanLepage ];
   };
 }

pkgs/development/tools/language-servers/typst-lsp/move-typst-assets.patch

@@ -1,15 +1,15 @@
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -1873,7 +1873,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
+@@ -2569,7 +2569,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
  [[package]]
  name = "typst"
  version = "0.5.0"
 -source = "git+https://github.com/typst/typst.git?tag=v0.5.0#3a8b9cce471934031ba57c5972d194ac1d7d2a6c"
 +source = "git+https://github.com/typst/typst.git?rev=30bb33aafced4f1bf4a00803550f0e1e42672ded#30bb33aafced4f1bf4a00803550f0e1e42672ded"
  dependencies = [
-  "bitflags 2.3.1",
+  "bitflags 2.3.3",
   "bytemuck",
-@@ -1915,7 +1915,7 @@ dependencies = [
+@@ -2611,7 +2611,7 @@ dependencies = [
  [[package]]
  name = "typst-library"
  version = "0.5.0"
@@ -18,7 +18,7 @@
  dependencies = [
   "az",
   "chinese-number",
-@@ -1983,7 +1983,7 @@ dependencies = [
+@@ -2685,7 +2685,7 @@ dependencies = [
  [[package]]
  name = "typst-macros"
  version = "0.5.0"
@@ -29,10 +29,10 @@
   "proc-macro2",
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -32,6 +32,6 @@ tokio = { version = "1.26.0", features = [
-     "io-std",
+@@ -49,6 +49,6 @@ tracing-subscriber = { version = "0.3.17", default-features = false, features =
+     "registry",
+     "fmt",
  ] }
- tower-lsp = "0.19.0"
 -typst = { git = "https://github.com/typst/typst.git", tag = "v0.5.0" }
 -typst-library = { git = "https://github.com/typst/typst.git", tag = "v0.5.0" }
 +typst = { git = "https://github.com/typst/typst.git", rev = "30bb33aafced4f1bf4a00803550f0e1e42672ded" }