Unverified Commit 21796a35 authored by Emily's avatar Emily Committed by GitHub
Browse files

Merge pull request #333528 from emilazy/push-uprruwmzypry 

typst: patch `Cargo.lock` for Rust 1.80
parents 5d06d0d8 4daa3829

pkgs/by-name/ty/typst/Cargo.lock

+4 −4
Original line number Diff line number Diff line
@@ -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",

pkgs/by-name/ty/typst/package.nix

+4 −1
Original line number Diff line number Diff line
@@ -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 = ''