b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #223541 from drupol/bump/typst-v23-03-28

Browse source 
typst: 23-03-21-2 -> 23-03-28
This commit is contained in:
figsoda 2023-03-28 10:18:15 -04:00 committed by GitHub
parent 5a8991c6b3 c9e77048fb
commit 610cc4a01e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/tools/typesetting/typst/Cargo.lock generated
View file

@ -58,8 +58,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "biblatex"
version = "0.6.3"
source = "git+https://github.com/typst/biblatex#932ad283dd45dd88d4fa14dc5b9bda7a270ba027"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bc17a7f4d461f93f5dbbae4c961746cb4aafb5c6c1a61089a86836614932a3c"
dependencies = [
"chrono",
"numerals",
@ -159,8 +160,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
name = "comemo"
version = "0.1.0"
source = "git+https://github.com/typst/comemo#9b520e8f5284d1c39d0bb13eb426f923972775f8"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22bf2c21093020535dd771993fedae8dd55393a4258cca501a9b55a962d350a5"
dependencies = [
"comemo-macros",
"siphasher",
@ -168,8 +170,9 @@ dependencies = [
[[package]]
name = "comemo-macros"
version = "0.1.0"
source = "git+https://github.com/typst/comemo#9b520e8f5284d1c39d0bb13eb426f923972775f8"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9faa23f4534253fa656b176ff524d5cd7306a6fed3048929f9cc01ab38ab5a5a"
dependencies = [
"proc-macro2",
"quote",
@ -430,8 +433,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[package]]
name = "hayagriva"
version = "0.1.1"
source = "git+https://github.com/typst/hayagriva#754efb7e1034bcd4d4f1366e432197edbbfb9ed5"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33f939b9606af811242f770582c89a2f8bb5de4e531c0a1df9d2d4906bcbc32a"
dependencies = [
"biblatex",
"chrono",
@ -844,7 +848,8 @@ checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468"
[[package]]
name = "pixglyph"
version = "0.1.0"
source = "git+https://github.com/typst/pixglyph#e3ff0272d6723cdada91a00b0c99cda0e5adb56d"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9eefadd393715fe315c8cdcd587f893b818a6dfe4f6f9faeb44b764c7c38fd8b"
dependencies = [
"ttf-parser 0.18.1",
]
@ -1500,7 +1505,8 @@ checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
[[package]]
name = "unicode-math-class"
version = "0.1.0"
source = "git+https://github.com/typst/unicode-math-class#a7ac7dd75cd79ab2e0bdb629036cb913371608d2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65"
[[package]]
name = "unicode-normalization"

22
pkgs/tools/typesetting/typst/default.nix
View file

@ -7,25 +7,20 @@
rustPlatform.buildRustPackage rec {
pname = "typst";
version = "23-03-21-2";
version = "23-03-28";
src = fetchFromGitHub {
owner = "typst";
repo = "typst";
rev = "v${version}";
hash = "sha256-bJPGs/Bd9nKYDrCCaFT+20+1wTN4YdkV8bGrtOCR4tM=";
hash = "sha256-0fTGbXdpzPadABWqdReQNZf2N7OMZ8cs9U5fmhfN6m4=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"biblatex-0.6.3" = "sha256-TfH2tk7B61HHqpdGY48TdPKelp4+78x+8LRFobAg8QA=";
"comemo-0.1.0" = "sha256-zg056kUc8sVLQ8vvT4uOuRJnyrCORsGYUvsjBJEkFPg=";
"hayagriva-0.1.1" = "sha256-HGQ+jNAnejxUBQNaqXPw57zfAC3qNXSWUVzDALZTXg0=";
"iai-0.1.1" = "sha256-EdNzCPht5chg7uF9O8CtPWR/bzSYyfYIXNdLltqdlR0=";
"lipsum-0.8.2" = "sha256-deIbpn4YM7/NeuJ5Co48ivJmxwrcsbLl6c3cP3JZxAQ=";
"pixglyph-0.1.0" = "sha256-8veNF3rzV21ayzk9gh2x0mQA8nHGM662ohvh084a0vk=";
"unicode-math-class-0.1.0" = "sha256-NkwDzj1SfUe570UcfotmVP6bIEYwiegZd0j8TPEWoOk=";
};
};
@ -36,20 +31,13 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "-p" "typst-cli" ];
cargoTestFlags = [ "-p" "typst-cli" ];
# the build script tries to get the revision using git
# which overwrites the environment variable set below
postPatch = ''
rm cli/build.rs
'';
# git revision used for `--version`
# https://github.com/typst/typst/blob/b934a2fd83d63fc115c01f959e888c7bc1aa87e4/cli/build.rs#L7
TYPST_HASH = "b934a2fd";
# https://github.com/typst/typst/blob/056d15a/cli/src/main.rs#L164
TYPST_VERSION = version;
meta = with lib; {
description = "A new markup-based typesetting system that is powerful and easy to learn";
homepage = "https://typst.app";
license = licenses.asl20;
maintainers = with maintainers; [ figsoda kanashimia ];
maintainers = with maintainers; [ drupol figsoda kanashimia ];
};
}