1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 03:30:45 +00:00
Gaetan Lepage 2024-08-02 08:16:10 +02:00
parent 32767490f4
commit 1714981f49
3 changed files with 65 additions and 51 deletions

View file

@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
name = "tinymist"; name = "tinymist";
publisher = "myriad-dreamin"; publisher = "myriad-dreamin";
inherit (tinymist) version; inherit (tinymist) version;
hash = "sha256-AB+jLcY9VfJgqcbh8PEZ9nRiJPv4EcSG1arSeW6dCBo="; hash = "sha256-eM9FVeMPpNtd3ytTzrB8aVF+h25pUI+F5rXhv+vQmg0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -3500,7 +3500,7 @@ dependencies = [
[[package]] [[package]]
name = "sync-lsp" name = "sync-lsp"
version = "0.11.16" version = "0.11.18"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@ -3639,7 +3639,7 @@ dependencies = [
[[package]] [[package]]
name = "tests" name = "tests"
version = "0.11.16" version = "0.11.18"
dependencies = [ dependencies = [
"insta", "insta",
"lsp-server", "lsp-server",
@ -3736,7 +3736,7 @@ dependencies = [
[[package]] [[package]]
name = "tinymist" name = "tinymist"
version = "0.11.16" version = "0.11.18"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -3768,8 +3768,9 @@ dependencies = [
"reflexo", "reflexo",
"serde", "serde",
"serde_json", "serde_json",
"serde_yaml",
"sync-lsp", "sync-lsp",
"tinymist-assets 0.11.16 (registry+https://github.com/rust-lang/crates.io-index)", "tinymist-assets 0.11.18 (registry+https://github.com/rust-lang/crates.io-index)",
"tinymist-query", "tinymist-query",
"tinymist-render", "tinymist-render",
"tokio", "tokio",
@ -3777,6 +3778,7 @@ dependencies = [
"toml 0.8.14", "toml 0.8.14",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
"typlite",
"typst", "typst",
"typst-assets", "typst-assets",
"typst-pdf", "typst-pdf",
@ -3796,17 +3798,17 @@ dependencies = [
[[package]] [[package]]
name = "tinymist-assets" name = "tinymist-assets"
version = "0.11.16" version = "0.11.18"
[[package]] [[package]]
name = "tinymist-assets" name = "tinymist-assets"
version = "0.11.16" version = "0.11.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "062cb57e1c109783370323fd2aa7c5160b3b1e169bf7f5fffb196e8157bedcd3" checksum = "a605bc6205d083682a6aab21cce336fa0444bdafbdad067b949fae19ef1e38dd"
[[package]] [[package]]
name = "tinymist-query" name = "tinymist-query"
version = "0.11.16" version = "0.11.18"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"biblatex", "biblatex",
@ -3852,7 +3854,7 @@ dependencies = [
[[package]] [[package]]
name = "tinymist-render" name = "tinymist-render"
version = "0.11.16" version = "0.11.18"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"log", "log",
@ -4127,16 +4129,23 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
[[package]] [[package]]
name = "typlite" name = "typlite"
version = "0.11.16" version = "0.11.18"
dependencies = [ dependencies = [
"base64 0.22.1",
"comemo 0.4.0",
"ecow 0.2.2",
"insta", "insta",
"regex",
"typst",
"typst-assets",
"typst-svg",
"typst-syntax 0.11.1", "typst-syntax 0.11.1",
] ]
[[package]] [[package]]
name = "typst" name = "typst"
version = "0.11.1" version = "0.11.1"
source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74"
dependencies = [ dependencies = [
"az", "az",
"bitflags 2.6.0", "bitflags 2.6.0",
@ -4203,7 +4212,7 @@ checksum = "2b3061f8d268e8eec7481c9ab24540455cb4912983c49aae38fa6e8bf8ef4d9c"
[[package]] [[package]]
name = "typst-macros" name = "typst-macros"
version = "0.11.1" version = "0.11.1"
source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74"
dependencies = [ dependencies = [
"heck 0.4.1", "heck 0.4.1",
"proc-macro2", "proc-macro2",
@ -4214,7 +4223,7 @@ dependencies = [
[[package]] [[package]]
name = "typst-pdf" name = "typst-pdf"
version = "0.11.1" version = "0.11.1"
source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"bytemuck", "bytemuck",
@ -4238,7 +4247,7 @@ dependencies = [
[[package]] [[package]]
name = "typst-preview" name = "typst-preview"
version = "0.11.16" version = "0.11.18"
dependencies = [ dependencies = [
"clap", "clap",
"comemo 0.4.0", "comemo 0.4.0",
@ -4249,7 +4258,7 @@ dependencies = [
"once_cell", "once_cell",
"serde", "serde",
"serde_json", "serde_json",
"tinymist-assets 0.11.16 (registry+https://github.com/rust-lang/crates.io-index)", "tinymist-assets 0.11.18 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio", "tokio",
"tokio-tungstenite", "tokio-tungstenite",
"typst", "typst",
@ -4262,7 +4271,7 @@ dependencies = [
[[package]] [[package]]
name = "typst-render" name = "typst-render"
version = "0.11.1" version = "0.11.1"
source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"comemo 0.4.0", "comemo 0.4.0",
@ -4282,7 +4291,7 @@ dependencies = [
[[package]] [[package]]
name = "typst-svg" name = "typst-svg"
version = "0.11.1" version = "0.11.1"
source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"comemo 0.4.0", "comemo 0.4.0",
@ -4315,7 +4324,7 @@ dependencies = [
[[package]] [[package]]
name = "typst-syntax" name = "typst-syntax"
version = "0.11.1" version = "0.11.1"
source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74"
dependencies = [ dependencies = [
"comemo 0.4.0", "comemo 0.4.0",
"ecow 0.2.2", "ecow 0.2.2",
@ -4331,7 +4340,7 @@ dependencies = [
[[package]] [[package]]
name = "typst-timing" name = "typst-timing"
version = "0.11.1" version = "0.11.1"
source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74"
dependencies = [ dependencies = [
"parking_lot", "parking_lot",
"serde", "serde",

View file

@ -1,53 +1,55 @@
{ lib {
, rustPlatform lib,
, fetchFromGitHub rustPlatform,
, pkg-config fetchFromGitHub,
, libgit2 pkg-config,
, openssl libgit2,
, zlib openssl,
, stdenv zlib,
, darwin stdenv,
, nix-update-script darwin,
, testers nix-update-script,
, tinymist testers,
tinymist,
vscode-extensions,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "tinymist"; pname = "tinymist";
# Please update the corresponding vscode extension when updating # Please update the corresponding vscode extension when updating
# this derivation. # this derivation.
version = "0.11.16"; version = "0.11.18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Myriad-Dreamin"; owner = "Myriad-Dreamin";
repo = "tinymist"; repo = "tinymist";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-5UNgjK4636XXjUaq2XqYs1a7vY1b+0OGZbI0xajSVcc="; hash = "sha256-2tf2Dg6HfJrHQgjNKtJNT7kLoUKMoLe6U2O7VsMg7Vs=";
}; };
cargoLock = { cargoLock = {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
outputHashes = { outputHashes = {
"typst-0.11.1" = "sha256-VDwyTKrtzmjMhVCp/GnZrgL6P6dLyKlLNA+LhoXBDl0="; "typst-0.11.1" = "sha256-dQf4qYaOni/jwIjRVXXCZLTn6ox3v6EyhCbaONqNtcw=";
"typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; "typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg=";
"typstfmt_lib-0.2.7" = "sha256-LBYsTCjZ+U+lgd7Z3H1sBcWwseoHsuepPd66bWgfvhI="; "typstfmt_lib-0.2.7" = "sha256-LBYsTCjZ+U+lgd7Z3H1sBcWwseoHsuepPd66bWgfvhI=";
}; };
}; };
nativeBuildInputs = [ nativeBuildInputs = [ pkg-config ];
pkg-config
];
buildInputs = [ buildInputs =
libgit2 [
openssl libgit2
zlib openssl
] ++ lib.optionals stdenv.isDarwin [ zlib
darwin.apple_sdk_11_0.frameworks.CoreFoundation ]
darwin.apple_sdk_11_0.frameworks.CoreServices ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk_11_0.frameworks.Security darwin.apple_sdk_11_0.frameworks.CoreFoundation
darwin.apple_sdk_11_0.frameworks.SystemConfiguration darwin.apple_sdk_11_0.frameworks.CoreServices
]; darwin.apple_sdk_11_0.frameworks.Security
darwin.apple_sdk_11_0.frameworks.SystemConfiguration
];
checkFlags = [ checkFlags = [
"--skip=e2e" "--skip=e2e"
@ -58,9 +60,12 @@ rustPlatform.buildRustPackage rec {
passthru = { passthru = {
updateScript = nix-update-script { }; updateScript = nix-update-script { };
tests.version = testers.testVersion { tests = {
command = "${meta.mainProgram} -V"; vscode-extension = vscode-extensions.myriad-dreamin.tinymist;
package = tinymist; version = testers.testVersion {
command = "${meta.mainProgram} -V";
package = tinymist;
};
}; };
}; };