From fd61e577354dcc704bfcdc82d26608196fad6043 Mon Sep 17 00:00:00 2001 From: Philipp Mildenberger Date: Thu, 15 Aug 2024 12:41:31 +0200 Subject: [PATCH] bandwhich: fix build by manually updating `time` --- pkgs/tools/networking/bandwhich/Cargo.lock | 20 ++++++++++++++------ pkgs/tools/networking/bandwhich/default.nix | 4 ++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/bandwhich/Cargo.lock b/pkgs/tools/networking/bandwhich/Cargo.lock index 2742af2bd33c..feb4351cdb2a 100644 --- a/pkgs/tools/networking/bandwhich/Cargo.lock +++ b/pkgs/tools/networking/bandwhich/Cargo.lock @@ -1074,6 +1074,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" @@ -1728,9 +1734,9 @@ checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" [[package]] name = "simplelog" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369" +checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0" dependencies = [ "log", "termcolor", @@ -1887,13 +1893,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -1909,10 +1916,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 9862bd5bd97a..eb361e1aac2d 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -30,6 +30,10 @@ rustPlatform.buildRustPackage rec { # 10 passed; 47 failed https://hydra.nixos.org/build/148943783/nixlog/1 doCheck = !stdenv.isDarwin; + postPatch = '' + ln --force -s ${./Cargo.lock} Cargo.lock + ''; + preConfigure = '' export BANDWHICH_GEN_DIR=_shell-files mkdir -p $BANDWHICH_GEN_DIR