Unverified Commit ed4e2af6 authored by figsoda's avatar figsoda Committed by GitHub
Browse files

Merge pull request #236859 from figsoda/typst

parents 4da75c1f 572f5a9a

pkgs/tools/typesetting/typst/Cargo.lock

+285 −17
Original line number Diff line number Diff line
@@ -195,9 +195,9 @@ dependencies = [ 


[[package]]

name = "bumpalo"

version = "3.12.2"

version = "3.13.0"

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

checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b"

checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"



[[package]]

name = "bytemuck"
@@ -338,6 +338,12 @@ dependencies = [ 
 "roff",

]



[[package]]

name = "cobs"

version = "0.2.3"

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

checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"



[[package]]

name = "codespan-reporting"

version = "0.11.1"
@@ -803,6 +809,118 @@ dependencies = [ 
 "cc",

]



[[package]]

name = "icu_collections"

version = "1.2.0"

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

checksum = "ef8302d8dfd6044d3ddb3f807a5ef3d7bbca9a574959c6d6e4dc39aa7012d0d5"

dependencies = [

 "displaydoc",

 "serde",

 "yoke",

 "zerofrom",

 "zerovec",

]



[[package]]

name = "icu_locid"

version = "1.2.0"

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

checksum = "3003f85dccfc0e238ff567693248c59153a46f4e6125ba4020b973cef4d1d335"

dependencies = [

 "displaydoc",

 "litemap",

 "tinystr",

 "writeable",

 "zerovec",

]



[[package]]

name = "icu_properties"

version = "1.2.0"

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

checksum = "ce0e1aa26851f16c9e04412a5911c86b7f8768dac8f8d4c5f1c568a7e5d7a434"

dependencies = [

 "displaydoc",

 "icu_collections",

 "icu_provider",

 "serde",

 "tinystr",

 "zerovec",

]



[[package]]

name = "icu_provider"

version = "1.2.0"

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

checksum = "8dc312a7b6148f7dfe098047ae2494d12d4034f48ade58d4f353000db376e305"

dependencies = [

 "displaydoc",

 "icu_locid",

 "icu_provider_macros",

 "postcard",

 "serde",

 "stable_deref_trait",

 "writeable",

 "yoke",

 "zerofrom",

 "zerovec",

]



[[package]]

name = "icu_provider_adapters"

version = "1.2.0"

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

checksum = "f4ae1e2bd0c41728b77e7c46e9afdec5e2127d1eedacc684724667d50c126bd3"

dependencies = [

 "icu_locid",

 "icu_provider",

 "tinystr",

 "yoke",

 "zerovec",

]



[[package]]

name = "icu_provider_blob"

version = "1.2.0"

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

checksum = "fd364c9a01f791a4bc04a74cf2a1d01d9f6926a40fd5ae1c28004e1e70d8338b"

dependencies = [

 "icu_provider",

 "postcard",

 "serde",

 "writeable",

 "yoke",

 "zerovec",

]



[[package]]

name = "icu_provider_macros"

version = "1.2.0"

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

checksum = "dd8b728b9421e93eff1d9f8681101b78fa745e0748c95c655c83f337044a7e10"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 1.0.109",

]



[[package]]

name = "icu_segmenter"

version = "1.2.1"

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

checksum = "c3300a7b6bf187be98a57264ad094f11f2e062c2e8263132af010ff522ee5495"

dependencies = [

 "displaydoc",

 "icu_collections",

 "icu_locid",

 "icu_provider",

 "num-traits",

 "serde",

 "utf8_iter",

 "zerovec",

]



[[package]]

name = "idna"

version = "0.3.0"
@@ -1063,6 +1181,12 @@ dependencies = [ 
 "libdeflate-sys",

]



[[package]]

name = "libm"

version = "0.2.7"

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

checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"



[[package]]

name = "linked-hash-map"

version = "0.5.6"
@@ -1085,6 +1209,12 @@ dependencies = [ 
 "rand_chacha",

]



[[package]]

name = "litemap"

version = "0.7.0"

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

checksum = "3a04a5b2b6f54acba899926491d0a6c59d98012938ca2ab5befb281c034e8f94"



[[package]]

name = "lock_api"

version = "0.4.9"
@@ -1227,6 +1357,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"

dependencies = [

 "autocfg",

 "libm",

]



[[package]]
@@ -1397,6 +1528,16 @@ dependencies = [ 
 "miniz_oxide",

]



[[package]]

name = "postcard"

version = "1.0.4"

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

checksum = "cfa512cd0d087cc9f99ad30a1bf64795b67871edbead083ffc3a4dfafa59aa00"

dependencies = [

 "cobs",

 "serde",

]



[[package]]

name = "ppv-lite86"

version = "0.2.17"
@@ -1911,6 +2052,18 @@ dependencies = [ 
 "unicode-ident",

]



[[package]]

name = "synstructure"

version = "0.12.6"

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

checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 1.0.109",

 "unicode-xid",

]



[[package]]

name = "syntect"

version = "5.0.0"
@@ -1996,6 +2149,33 @@ dependencies = [ 
 "once_cell",

]



[[package]]

name = "time"

version = "0.3.21"

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

checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"

dependencies = [

 "itoa",

 "serde",

 "time-core",

 "time-macros",

]



[[package]]

name = "time-core"

version = "0.1.1"

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

checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"



[[package]]

name = "time-macros"

version = "0.2.9"

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

checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"

dependencies = [

 "time-core",

]



[[package]]

name = "tiny-skia"

version = "0.9.1"
@@ -2029,6 +2209,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef"

dependencies = [

 "displaydoc",

 "serde",

 "zerovec",

]



[[package]]
@@ -2173,7 +2355,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" 


[[package]]

name = "typst"

version = "0.4.0"

version = "0.5.0"

dependencies = [

 "bitflags 2.3.1",

 "bytemuck",
@@ -2198,6 +2380,7 @@ dependencies = [ 
 "stacker",

 "subsetter",

 "svg2pdf",

 "time",

 "tiny-skia",

 "tracing",

 "ttf-parser",
@@ -2213,9 +2396,8 @@ dependencies = [ 


[[package]]

name = "typst-cli"

version = "0.4.0"

version = "0.5.0"

dependencies = [

 "atty",

 "chrono",

 "clap 4.2.7",

 "clap_complete",
@@ -2243,7 +2425,7 @@ dependencies = [ 


[[package]]

name = "typst-docs"

version = "0.4.0"

version = "0.5.0"

dependencies = [

 "comemo",

 "heck",
@@ -2262,7 +2444,7 @@ dependencies = [ 


[[package]]

name = "typst-library"

version = "0.4.0"

version = "0.5.0"

dependencies = [

 "az",

 "chinese-number",
@@ -2271,6 +2453,11 @@ dependencies = [ 
 "ecow",

 "hayagriva",

 "hypher",

 "icu_properties",

 "icu_provider",

 "icu_provider_adapters",

 "icu_provider_blob",

 "icu_segmenter",

 "kurbo",

 "lipsum",

 "log",
@@ -2281,6 +2468,7 @@ dependencies = [ 
 "serde_yaml",

 "smallvec",

 "syntect",

 "time",

 "toml",

 "tracing",

 "ttf-parser",
@@ -2290,22 +2478,21 @@ dependencies = [ 
 "unicode-math-class",

 "unicode-script",

 "unicode-segmentation",

 "xi-unicode",

]



[[package]]

name = "typst-macros"

version = "0.4.0"

version = "0.5.0"

dependencies = [

 "heck",

 "proc-macro2",

 "quote",

 "syn 1.0.109",

 "syn 2.0.16",

]



[[package]]

name = "typst-tests"

version = "0.4.0"

version = "0.5.0"

dependencies = [

 "clap 4.2.7",

 "comemo",
@@ -2418,6 +2605,12 @@ version = "0.1.10" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"



[[package]]

name = "unicode-xid"

version = "0.2.4"

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

checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"



[[package]]

name = "unicode_names2"

version = "0.6.0"
@@ -2501,6 +2694,12 @@ dependencies = [ 
 "svgtypes",

]



[[package]]

name = "utf8_iter"

version = "1.0.3"

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

checksum = "64a8922555b9500e3d865caed19330172cd67cbf82203f1a3311d8c305cc9f33"



[[package]]

name = "utf8parse"

version = "0.2.1"
@@ -2785,6 +2984,12 @@ dependencies = [ 
 "memchr",

]



[[package]]

name = "writeable"

version = "0.5.2"

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

checksum = "60e49e42bdb1d5dc76f4cd78102f8f0714d32edfa3efb82286eb0f0b1fc0da0f"



[[package]]

name = "wyz"

version = "0.5.1"
@@ -2794,12 +2999,6 @@ dependencies = [ 
 "tap",

]



[[package]]

name = "xi-unicode"

version = "0.3.0"

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

checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"



[[package]]

name = "xmlparser"

version = "0.13.5"
@@ -2837,6 +3036,75 @@ dependencies = [ 
 "linked-hash-map",

]



[[package]]

name = "yoke"

version = "0.7.1"

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

checksum = "1848075a23a28f9773498ee9a0f2cf58fcbad4f8c0ccf84a210ab33c6ae495de"

dependencies = [

 "serde",

 "stable_deref_trait",

 "yoke-derive",

 "zerofrom",

]



[[package]]

name = "yoke-derive"

version = "0.7.1"

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

checksum = "af46c169923ed7516eef0aa32b56d2651b229f57458ebe46b49ddd6efef5b7a2"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 1.0.109",

 "synstructure",

]



[[package]]

name = "zerofrom"

version = "0.1.2"

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

checksum = "df54d76c3251de27615dfcce21e636c172dafb2549cd7fd93e21c66f6ca6bea2"

dependencies = [

 "zerofrom-derive",

]



[[package]]

name = "zerofrom-derive"

version = "0.1.2"

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

checksum = "b4eae7c1f7d4b8eafce526bc0771449ddc2f250881ae31c50d22c032b5a1c499"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 1.0.109",

 "synstructure",

]



[[package]]

name = "zerovec"

version = "0.9.4"

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

checksum = "198f54134cd865f437820aa3b43d0ad518af4e68ee161b444cdd15d8e567c8ea"

dependencies = [

 "serde",

 "yoke",

 "zerofrom",

 "zerovec-derive",

]



[[package]]

name = "zerovec-derive"

version = "0.9.4"

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

checksum = "486558732d5dde10d0f8cb2936507c1bb21bc539d924c949baf5f36a58e51bac"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 1.0.109",

 "synstructure",

]



[[package]]

name = "zopfli"

version = "0.7.2"

pkgs/tools/typesetting/typst/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ 


rustPlatform.buildRustPackage rec {

  pname = "typst";

  version = "0.4.0";

  version = "0.5.0";



  src = fetchFromGitHub {

    owner = "typst";

    repo = "typst";

    rev = "v${version}";

    hash = "sha256-S8J2D87Zvyh501d8LG69in9om/nTS6Y+IDhJvjm/H0w=";

    hash = "sha256-eBJ5JaYp+Lnz+DK5WuFg7fiN85ATRmmaxWeyOBFbYnU=";

  };



  cargoLock = {