Merge pull request #297807 from drupol/typstfmt/bump/0-2-9 (df3a7e8c) · Commits · nix / nixpkgs

pkgs/tools/typesetting/typstfmt/Cargo.lock→pkgs/by-name/ty/typstfmt/Cargo.lock

+92 −86

Original line number	Diff line number	Diff line
		@@ -19,9 +19,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

		[[package]]
		name = "bitflags"
		version = "2.4.1"
		version = "2.4.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
		checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"

		[[package]]
		name = "bstr"
		@@ -36,9 +36,9 @@ dependencies = [

		[[package]]
		name = "bstr"
		version = "1.8.0"
		version = "1.9.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c"
		checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
		dependencies = [
		"memchr",
		"serde",
		@@ -85,9 +85,9 @@ dependencies = [

		[[package]]
		name = "console"
		version = "0.15.7"
		version = "0.15.8"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
		checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
		dependencies = [
		"encode_unicode",
		"lazy_static",
		@@ -117,18 +117,18 @@ dependencies = [

		[[package]]
		name = "ecow"
		version = "0.1.2"
		version = "0.2.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "1d1990d053cf6edf3f030682dba3b0eb65ef01fabb2686072765d8a17d6728e8"
		checksum = "e6ea5e3f9cda726431da9d1a8d5a29785d544b31e98e1ca7a210906244002e02"
		dependencies = [
		"serde",
		]

		[[package]]
		name = "either"
		version = "1.9.0"
		version = "1.10.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
		checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"

		[[package]]
		name = "encode_unicode"
		@@ -144,9 +144,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"

		[[package]]
		name = "getrandom"
		version = "0.2.11"
		version = "0.2.12"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
		checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
		dependencies = [
		"cfg-if",
		"libc",
		@@ -171,9 +171,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
		dependencies = [
		"aho-corasick",
		"bstr 1.8.0",
		"bstr 1.9.1",
		"log",
		"regex-automata 0.4.3",
		"regex-automata 0.4.5",
		"regex-syntax",
		]

		@@ -185,9 +185,9 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"

		[[package]]
		name = "indexmap"
		version = "2.1.0"
		version = "2.2.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
		checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
		dependencies = [
		"equivalent",
		"hashbrown",
		@@ -195,9 +195,9 @@ dependencies = [

		[[package]]
		name = "insta"
		version = "1.34.0"
		version = "1.35.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc"
		checksum = "7c985c1bef99cf13c58fade470483d81a2bfe846ebde60ed28cc2dddec2df9e2"
		dependencies = [
		"console",
		"lazy_static",
		@@ -229,9 +229,9 @@ checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401"

		[[package]]
		name = "libc"
		version = "0.2.150"
		version = "0.2.153"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
		checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"

		[[package]]
		name = "libredox"
		@@ -239,7 +239,7 @@ version = "0.0.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
		dependencies = [
		"bitflags 2.4.1",
		"bitflags 2.4.2",
		"libc",
		"redox_syscall",
		]
		@@ -258,9 +258,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"

		[[package]]
		name = "memchr"
		version = "2.6.4"
		version = "2.7.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
		checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"

		[[package]]
		name = "nu-ansi-term"
		@@ -274,9 +274,9 @@ dependencies = [

		[[package]]
		name = "once_cell"
		version = "1.18.0"
		version = "1.19.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
		checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"

		[[package]]
		name = "overload"
		@@ -292,18 +292,18 @@ checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"

		[[package]]
		name = "proc-macro2"
		version = "1.0.70"
		version = "1.0.78"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
		checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
		dependencies = [
		"unicode-ident",
		]

		[[package]]
		name = "quote"
		version = "1.0.33"
		version = "1.0.35"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
		checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
		dependencies = [
		"proc-macro2",
		]
		@@ -330,13 +330,13 @@ dependencies = [

		[[package]]
		name = "regex"
		version = "1.10.2"
		version = "1.10.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
		checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
		dependencies = [
		"aho-corasick",
		"memchr",
		"regex-automata 0.4.3",
		"regex-automata 0.4.5",
		"regex-syntax",
		]

		@@ -348,9 +348,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"

		[[package]]
		name = "regex-automata"
		version = "0.4.3"
		version = "0.4.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
		checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
		dependencies = [
		"aho-corasick",
		"memchr",
		@@ -374,18 +374,18 @@ dependencies = [

		[[package]]
		name = "serde"
		version = "1.0.193"
		version = "1.0.197"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
		checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
		dependencies = [
		"serde_derive",
		]

		[[package]]
		name = "serde_derive"
		version = "1.0.193"
		version = "1.0.197"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
		checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
		dependencies = [
		"proc-macro2",
		"quote",
		@@ -394,9 +394,9 @@ dependencies = [

		[[package]]
		name = "serde_spanned"
		version = "0.6.4"
		version = "0.6.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
		checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
		dependencies = [
		"serde",
		]
		@@ -412,9 +412,9 @@ dependencies = [

		[[package]]
		name = "similar"
		version = "2.3.0"
		version = "2.4.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597"
		checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21"
		dependencies = [
		"bstr 0.2.17",
		"unicode-segmentation",
		@@ -438,15 +438,15 @@ checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe"

		[[package]]
		name = "smallvec"
		version = "1.11.2"
		version = "1.13.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
		checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"

		[[package]]
		name = "syn"
		version = "2.0.39"
		version = "2.0.52"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
		checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
		dependencies = [
		"proc-macro2",
		"quote",
		@@ -455,18 +455,18 @@ dependencies = [

		[[package]]
		name = "thiserror"
		version = "1.0.50"
		version = "1.0.57"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
		checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
		dependencies = [
		"thiserror-impl",
		]

		[[package]]
		name = "thiserror-impl"
		version = "1.0.50"
		version = "1.0.57"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
		checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
		dependencies = [
		"proc-macro2",
		"quote",
		@@ -475,9 +475,9 @@ dependencies = [

		[[package]]
		name = "thread_local"
		version = "1.1.7"
		version = "1.1.8"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
		checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
		dependencies = [
		"cfg-if",
		"once_cell",
		@@ -585,8 +585,8 @@ dependencies = [

		[[package]]
		name = "typst-syntax"
		version = "0.7.0"
		source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9"
		version = "0.10.0"
		source = "git+https://github.com/typst/typst.git?tag=v0.10.0#70ca0d257bb4ba927f63260e20443f244e0bb58c"
		dependencies = [
		"comemo",
		"ecow",
		@@ -595,26 +595,20 @@ dependencies = [
		"tracing",
		"unicode-ident",
		"unicode-math-class",
		"unicode-script",
		"unicode-segmentation",
		"unscanny",
		]

		[[package]]
		name = "typstfmt"
		version = "0.2.7"
		version = "0.2.9"
		dependencies = [
		"confy",
		"lexopt",
		"typstfmt_lib",
		]

		[[package]]
		name = "typstfmt_lib"
		version = "0.2.7"
		dependencies = [
		"globmatch",
		"insta",
		"itertools",
		"lexopt",
		"regex",
		"serde",
		"similar-asserts",
		@@ -622,7 +616,7 @@ dependencies = [
		"tracing",
		"tracing-subscriber",
		"typst-syntax",
		"unicode-segmentation",
		"unicode-width",
		]

		[[package]]
		@@ -637,11 +631,23 @@ version = "0.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65"

		[[package]]
		name = "unicode-script"
		version = "0.5.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd"

		[[package]]
		name = "unicode-segmentation"
		version = "1.10.1"
		version = "1.11.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"

		[[package]]
		name = "unicode-width"
		version = "0.1.11"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
		checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"

		[[package]]
		name = "unscanny"
		@@ -704,18 +710,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

		[[package]]
		name = "windows-sys"
		version = "0.45.0"
		version = "0.52.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
		checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
		dependencies = [
		"windows-targets",
		]

		[[package]]
		name = "windows-targets"
		version = "0.42.2"
		version = "0.52.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
		checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
		dependencies = [
		"windows_aarch64_gnullvm",
		"windows_aarch64_msvc",
		@@ -728,51 +734,51 @@ dependencies = [

		[[package]]
		name = "windows_aarch64_gnullvm"
		version = "0.42.2"
		version = "0.52.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
		checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"

		[[package]]
		name = "windows_aarch64_msvc"
		version = "0.42.2"
		version = "0.52.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
		checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"

		[[package]]
		name = "windows_i686_gnu"
		version = "0.42.2"
		version = "0.52.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
		checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"

		[[package]]
		name = "windows_i686_msvc"
		version = "0.42.2"
		version = "0.52.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
		checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"

		[[package]]
		name = "windows_x86_64_gnu"
		version = "0.42.2"
		version = "0.52.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
		checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"

		[[package]]
		name = "windows_x86_64_gnullvm"
		version = "0.42.2"
		version = "0.52.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
		checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"

		[[package]]
		name = "windows_x86_64_msvc"
		version = "0.42.2"
		version = "0.52.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
		checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"

		[[package]]
		name = "winnow"
		version = "0.5.25"
		version = "0.5.40"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94"
		checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
		dependencies = [
		"memchr",
		]

pkgs/tools/typesetting/typstfmt/default.nix→pkgs/by-name/ty/typstfmt/package.nix

+11 −8

Original line number	Diff line number	Diff line
		{ lib, rustPlatform, fetchFromGitHub }:
		{ lib
		, rustPlatform
		, fetchFromGitHub
		}:

		rustPlatform.buildRustPackage rec {
		pname = "typstfmt";
		version = "0.2.7";
		version = "0.2.9";

		src = fetchFromGitHub {
		owner = "astrale-sharp";
		repo = "typstfmt";
		rev = version;
		hash = "sha256-LBYsTCjZ+U+lgd7Z3H1sBcWwseoHsuepPd66bWgfvhI=";
		hash = "sha256-bSjUr6tHQrmni/YmApHrvY2cVz3xf1VKfg35BJjuOZM=";
		};

		cargoLock = {
		lockFile = ./Cargo.lock;
		outputHashes = {
		"typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg=";
		"typst-syntax-0.10.0" = "sha256-qiskc0G/ZdLRZjTicoKIOztRFem59TM4ki23Rl55y9s=";
		};
		};

		meta = with lib; {
		meta = {
		changelog = "https://github.com/astrale-sharp/typstfmt/blob/${src.rev}/CHANGELOG.md";
		description = "A formatter for the Typst language";
		homepage = "https://github.com/astrale-sharp/typstfmt";
		changelog = "https://github.com/astrale-sharp/typstfmt/blob/${src.rev}/CHANGELOG.md";
		license = licenses.mit;
		maintainers = with maintainers; [ figsoda geri1701 ];
		license = lib.licenses.mit;
		mainProgram = "typstfmt";
		maintainers = with lib.maintainers; [ figsoda geri1701 ];
		};
		}

pkgs/top-level/all-packages.nix

+0 −2

Original line number	Diff line number	Diff line
		@@ -14110,8 +14110,6 @@ with pkgs;

		typos = callPackage ../development/tools/typos { };

		typstfmt = callPackage ../tools/typesetting/typstfmt { };

		typst-live = callPackage ../tools/typesetting/typst-live { };

		tz = callPackage ../tools/misc/tz { };