From b6449719d40be266f0666de55eaac60ca09eac1d Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 30 Jun 2023 11:08:32 -0400 Subject: [PATCH] typst: 0.5.0 -> 0.6.0 Diff: https://github.com/typst/typst/compare/v0.5.0...v0.6.0 Changelog: https://github.com/typst/typst/releases/tag/v0.6.0 --- pkgs/tools/typesetting/typst/Cargo.lock | 145 ++++++++++++++++++++--- pkgs/tools/typesetting/typst/default.nix | 4 +- 2 files changed, 130 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/typesetting/typst/Cargo.lock b/pkgs/tools/typesetting/typst/Cargo.lock index 0cf7b79d5ee8..044c7c9836d4 100644 --- a/pkgs/tools/typesetting/typst/Cargo.lock +++ b/pkgs/tools/typesetting/typst/Cargo.lock @@ -522,6 +522,9 @@ name = "ecow" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5c5051925c54d9a42c8652313b5358a7432eed209466b443ed5220431243a14" +dependencies = [ + "serde", +] [[package]] name = "either" @@ -529,15 +532,6 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" -[[package]] -name = "elsa" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e0aca8dce8856e420195bd13b6a64de3334235ccc9214e824b86b12bf26283" -dependencies = [ - "stable_deref_trait", -] - [[package]] name = "enum-ordinalize" version = "3.1.13" @@ -1726,6 +1720,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 = "roff" version = "0.2.1" @@ -1783,6 +1792,28 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "rustls" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.12" @@ -1826,6 +1857,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "semver" version = "1.0.17" @@ -1929,6 +1970,12 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +[[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" @@ -2091,6 +2138,17 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "tar" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +dependencies = [ + "filetime", + "libc", + "xattr", +] + [[package]] name = "tempfile" version = "3.5.0" @@ -2355,7 +2413,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typst" -version = "0.5.0" +version = "0.6.0" dependencies = [ "bitflags 2.3.1", "bytemuck", @@ -2382,6 +2440,7 @@ dependencies = [ "svg2pdf", "time", "tiny-skia", + "toml", "tracing", "ttf-parser", "typst-macros", @@ -2396,7 +2455,7 @@ dependencies = [ [[package]] name = "typst-cli" -version = "0.5.0" +version = "0.6.0" dependencies = [ "chrono", "clap 4.2.7", @@ -2405,7 +2464,7 @@ dependencies = [ "codespan-reporting", "comemo", "dirs", - "elsa", + "flate2", "inferno", "memmap2", "notify", @@ -2413,6 +2472,7 @@ dependencies = [ "open", "same-file", "siphasher", + "tar", "tempfile", "tracing", "tracing-error", @@ -2420,12 +2480,13 @@ dependencies = [ "tracing-subscriber", "typst", "typst-library", + "ureq", "walkdir", ] [[package]] name = "typst-docs" -version = "0.5.0" +version = "0.6.0" dependencies = [ "comemo", "heck", @@ -2434,6 +2495,7 @@ dependencies = [ "pulldown-cmark", "serde", "serde_yaml", + "syntect", "typed-arena", "typst", "typst-library", @@ -2444,7 +2506,7 @@ dependencies = [ [[package]] name = "typst-library" -version = "0.5.0" +version = "0.6.0" dependencies = [ "az", "chinese-number", @@ -2482,7 +2544,7 @@ dependencies = [ [[package]] name = "typst-macros" -version = "0.5.0" +version = "0.6.0" dependencies = [ "heck", "proc-macro2", @@ -2492,11 +2554,10 @@ dependencies = [ [[package]] name = "typst-tests" -version = "0.5.0" +version = "0.6.0" dependencies = [ "clap 4.2.7", "comemo", - "elsa", "iai", "once_cell", "oxipng", @@ -2623,6 +2684,28 @@ 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 = "ureq" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" +dependencies = [ + "base64", + "flate2", + "log", + "once_cell", + "rustls", + "rustls-webpki", + "url", + "webpki-roots", +] + [[package]] name = "url" version = "2.3.1" @@ -2788,6 +2871,25 @@ version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +[[package]] +name = "web-sys" +version = "0.3.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +dependencies = [ + "rustls-webpki", +] + [[package]] name = "weezl" version = "0.1.7" @@ -2999,6 +3101,15 @@ dependencies = [ "tap", ] +[[package]] +name = "xattr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] + [[package]] name = "xmlparser" version = "0.13.5" diff --git a/pkgs/tools/typesetting/typst/default.nix b/pkgs/tools/typesetting/typst/default.nix index 6b714da2454d..8cd9cda0e329 100644 --- a/pkgs/tools/typesetting/typst/default.nix +++ b/pkgs/tools/typesetting/typst/default.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "typst"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "typst"; repo = "typst"; rev = "v${version}"; - hash = "sha256-eBJ5JaYp+Lnz+DK5WuFg7fiN85ATRmmaxWeyOBFbYnU="; + hash = "sha256-8e6BNffKgAUNwic4uEfDh77y2nIyYt9BwZr+ypv+d5A="; }; cargoLock = {