Merge pull request #256012 from figsoda/typst-lsp

typst-lsp: 0.9.5 -> 0.10.0

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

@@ -1,36 +1,41 @@
 { lib
 , rustPlatform
 , fetchFromGitHub
+, fetchpatch
 , stdenv
 , darwin
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "typst-lsp";
-  version = "0.9.5";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "nvarner";
     repo = "typst-lsp";
     rev = "v${version}";
-    hash = "sha256-rV7vzI4PPyBJX/ofVCXnXd8eH6+UkGaAL7PwhP71t0k=";
+    hash = "sha256-rsG7YZjy4UgFGsehlslsrOAD5YMpVVBI2MERlxgniVA=";
   };
 
+  patches = [
+    # git information isn't available with fetchFromGitHub
+    # https://github.com/nvarner/typst-lsp/pull/303
+    (fetchpatch {
+      name = "fix-build-when-git-information-is-not-available.patch";
+      url = "https://github.com/nvarner/typst-lsp/commit/420de6235eb1aa492337a8cc43b04134a3ffab00.patch";
+      hash = "sha256-Rs9pzSUg4YNGzYnX8tbOmCwbPyZ9P18Eyg451fa2Iqg=";
+    })
+  ];
+
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "typst-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg=";
-      "typstfmt_lib-0.2.0" = "sha256-DOh7WQowJXTxI9GDXfy73hvr3J+VcDqSDaClLlUpMsM=";
+      "typst-0.8.0" = "sha256-q2b/PoNwpzarJbIPzokYgZRD2/Oe/XB40C4VXdwL/NA=";
+      "typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg=";
+      "typstfmt_lib-0.2.4" = "sha256-d0vlZqg0RcRvZM7xYdMLX2/UeolUbqZ9H4drJRRKBmc=";
     };
   };
 
-  patches = [
-    # update typstfmt to symlink its README.md into the library crate
-    # without this patch, typst-lsp fails to build when dependencies are vendored
-    # https://github.com/astrale-sharp/typstfmt/pull/81
-    ./update-typstfmt.patch
-  ];
-
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Security
   ];

pkgs/development/tools/language-servers/typst-lsp/update-typstfmt.patch

@@ -1,22 +0,0 @@
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -3390,7 +3390,7 @@ dependencies = [
- [[package]]
- name = "typstfmt_lib"
- version = "0.2.0"
--source = "git+https://github.com/astrale-sharp/typstfmt?rev=cf0ac91#cf0ac9189a4a2d47f4bc833f2538dca032534455"
-+source = "git+https://github.com/astrale-sharp/typstfmt?rev=45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880#45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880"
- dependencies = [
-  "globmatch",
-  "itertools 0.10.5",
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -70,7 +70,7 @@ tracing-subscriber = { version = "0.3.17", default-features = false, features =
-     "fmt",
- ] }
- walkdir = "2.3"
--typstfmt_lib = { git = "https://github.com/astrale-sharp/typstfmt", rev = "cf0ac91" }
-+typstfmt_lib = { git = "https://github.com/astrale-sharp/typstfmt", rev = "45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880" }
- 
- # jaeger
- opentelemetry = { version = "0.20.0", optional = true }