zerotierone: fix build with Rust 1.80 (#335676)

Manually bump the `time` crate in the `Cargo.lock` file, and the
`time-macros` dependency that needs to be bumped as well.

This fixes the build for zerotierone without having to wait for
https://github.com/NixOS/nixpkgs/pull/300532 and the staging cycle it
needs to go through.

Alternative to https://github.com/NixOS/nixpkgs/pull/335051, which
depends on above functionality.

See https://github.com/NixOS/nixpkgs/issues/332957 for context.
This commit is contained in:
Florian Klink 2024-08-19 10:38:56 +03:00 committed by GitHub
parent fe577e760b
commit 815d5589d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 5 deletions

View File

@ -2855,9 +2855,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",
@ -2876,9 +2876,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",

View File

@ -44,7 +44,10 @@ in stdenv.mkDerivation {
})
./0001-darwin-disable-link-time-optimization.patch
];
postPatch = "cp ${./Cargo.lock} Cargo.lock";
postPatch = ''
cp ${./Cargo.lock} Cargo.lock
cp ${./Cargo.lock} rustybits/Cargo.lock
'';
preConfigure = ''