From 20ba96dc38bf7bdf9b138170c38e6e51620fa387 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 10 Aug 2023 22:47:14 -0400 Subject: [PATCH] typst-lsp: 0.8.0 -> 0.8.1 Diff: https://github.com/nvarner/typst-lsp/compare/v0.8.0...v0.8.1 Changelog: https://github.com/nvarner/typst-lsp/releases/tag/v0.8.1 --- .../language-servers/typst-lsp/Cargo.lock | 118 +++++++++++++++++- .../language-servers/typst-lsp/default.nix | 4 +- .../typst-lsp/remove-svg2pdf-patch.patch | 9 +- 3 files changed, 124 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock index 3a5cafc2a227..ababbc9b3753 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock +++ b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock @@ -921,6 +921,20 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +dependencies = [ + "futures-util", + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + [[package]] name = "hyper-tls" version = "0.5.0" @@ -1973,6 +1987,7 @@ dependencies = [ "http", "http-body", "hyper", + "hyper-rustls", "hyper-tls", "ipnet", "js-sys", @@ -1982,11 +1997,14 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-native-tls", + "tokio-rustls", "tokio-util", "tower-service", "url", @@ -1994,6 +2012,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", + "webpki-roots", "winreg", ] @@ -2020,6 +2039,21 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + [[package]] name = "rosvgtree" version = "0.3.0" @@ -2061,6 +2095,37 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "rustls" +version = "0.21.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +dependencies = [ + "base64", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -2113,6 +2178,16 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "security-framework" version = "2.9.2" @@ -2296,6 +2371,12 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -2647,6 +2728,16 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.14" @@ -2963,7 +3054,7 @@ dependencies = [ [[package]] name = "typst-lsp" -version = "0.8.0" +version = "0.8.1" dependencies = [ "anyhow", "async-compression", @@ -3108,6 +3199,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + [[package]] name = "url" version = "2.4.0" @@ -3330,6 +3427,25 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki", +] + [[package]] name = "weezl" version = "0.1.7" diff --git a/pkgs/development/tools/language-servers/typst-lsp/default.nix b/pkgs/development/tools/language-servers/typst-lsp/default.nix index bcb65bf1f70d..732c979bbefb 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/default.nix +++ b/pkgs/development/tools/language-servers/typst-lsp/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "typst-lsp"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "nvarner"; repo = "typst-lsp"; rev = "v${version}"; - hash = "sha256-jYyWPA/ifCtxujPZK7am6O0d/VpRW8hxGfd83wUtT6U="; + hash = "sha256-Aq9KP9L9s42NmX45YVnGUMpP0MXKB1Pjd4W0f0U8T7o="; }; cargoLock = { diff --git a/pkgs/development/tools/language-servers/typst-lsp/remove-svg2pdf-patch.patch b/pkgs/development/tools/language-servers/typst-lsp/remove-svg2pdf-patch.patch index 67e4ca0788b2..ad277caa81b5 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/remove-svg2pdf-patch.patch +++ b/pkgs/development/tools/language-servers/typst-lsp/remove-svg2pdf-patch.patch @@ -1,6 +1,6 @@ --- a/Cargo.lock +++ b/Cargo.lock -@@ -2387,7 +2387,7 @@ dependencies = [ +@@ -2468,7 +2468,7 @@ dependencies = [ [[package]] name = "svg2pdf" version = "0.5.0" @@ -11,10 +11,11 @@ "miniz_oxide", --- a/Cargo.toml +++ b/Cargo.toml -@@ -61,12 +61,5 @@ typst = { git = "https://github.com/typst/typst.git", tag = "v0.6.0" } - typst-library = { git = "https://github.com/typst/typst.git", tag = "v0.6.0" } - walkdir = "2.3" +@@ -84,13 +84,5 @@ reqwest = { version = "0.11.18", default-features = false, features = [ + "rustls-tls", + ] } +- -# Typst 0.6.0 does not specify a tag or ref for svg2pdf, so provide one... -# ...but Cargo doesn't want to make our lives too easy, and we can't replace the -# dependency with another at the same URL. Use a workaroud inspired by