diff options
| author | Emily | 2024-08-11 12:06:27 +0100 |
|---|---|---|
| committer | GitHub | 2024-08-11 12:06:27 +0100 |
| commit | 21796a3560ba16db7d4f0ef6fd8f29d1903d0437 (patch) | |
| tree | 4ea89b0497bf4f34c6d10d3c54e19385fa98c7ee /pkgs | |
| parent | 5d06d0d8dff5d5d12d9d098fe18cd6a55f9ca1f5 (diff) | |
| parent | 4daa38290754f8a921c90381c7efb05ac993f2a9 (diff) | |
Merge pull request #333528 from emilazy/push-uprruwmzypry
typst: patch `Cargo.lock` for Rust 1.80
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/by-name/ty/typst/Cargo.lock | 8 | ||||
| -rw-r--r-- | pkgs/by-name/ty/typst/package.nix | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/by-name/ty/typst/Cargo.lock b/pkgs/by-name/ty/typst/Cargo.lock index 0a9e82ce5b2d..a613f4d957ba 100644 --- a/pkgs/by-name/ty/typst/Cargo.lock +++ b/pkgs/by-name/ty/typst/Cargo.lock @@ -2376,9 +2376,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -2397,9 +2397,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix index 11e5b9f5870b..aa71277fefab 100644 --- a/pkgs/by-name/ty/typst/package.nix +++ b/pkgs/by-name/ty/typst/package.nix @@ -47,10 +47,13 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = true; }; - # Fix for "Found argument '--test-threads' which wasn't expected, or isn't valid in this context" postPatch = '' + # Fix for "Found argument '--test-threads' which wasn't expected, or isn't valid in this context" substituteInPlace tests/src/tests.rs --replace-fail 'ARGS.num_threads' 'ARGS.test_threads' substituteInPlace tests/src/args.rs --replace-fail 'num_threads' 'test_threads' + + # Fix build with Rust 1.80; remove on next release + ln -sf ${./Cargo.lock} Cargo.lock ''; postInstall = '' |