Unverified Commit 8c9a7653 authored by Matthias Beyer's avatar Matthias Beyer Committed by GitHub
Browse files

Merge pull request #333665 from gepbird/cargo-geiger-fix-build 

cargo-geiger: fix build with rust 1.80
parents 772ac19c 28490c6b

pkgs/by-name/ca/cargo-geiger/fix-build-with-rust-1.80.patch

0 → 100644
+48 −0
Original line number Diff line number Diff line 
diff --git a/Cargo.lock b/Cargo.lock

index 48c5606f..4c796675 100644

--- a/Cargo.lock

+++ b/Cargo.lock

@@ -2238,6 +2238,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-traits"

 version = "0.2.17"

@@ -3148,13 +3154,14 @@ dependencies = [

 

 [[package]]

 name = "time"

-version = "0.3.30"

+version = "0.3.36"

 source = "registry+https://github.com/rust-lang/crates.io-index"

-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"

+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"

 dependencies = [

  "deranged",

  "itoa",

  "libc",

+ "num-conv",

  "num_threads",

  "powerfmt",

  "serde",

@@ -3170,10 +3177,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"

 

 [[package]]

 name = "time-macros"

-version = "0.2.15"

+version = "0.2.18"

 source = "registry+https://github.com/rust-lang/crates.io-index"

-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"

+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"

 dependencies = [

+ "num-conv",

  "time-core",

 ]

pkgs/by-name/ca/cargo-geiger/package.nix

+7 −1
Original line number Diff line number Diff line
@@ -20,7 +20,13 @@ rustPlatform.buildRustPackage rec { 
    rev = "cargo-geiger@v${version}";

    hash = "sha256-/5yuayqneZV6aVQ6YFgqNS2XY3W6yETRQ0kE5ovc7p8=";

  };

  cargoHash = "sha256-lhojo3dhsM9y1SxpVMH93yv+JeNfTL7VLsbTp9ErgIQ=";



  cargoPatches = [

    # https://github.com/geiger-rs/cargo-geiger/pull/528

    ./fix-build-with-rust-1.80.patch

  ];



  cargoHash = "sha256-511KeTykHw3xbnsuwIt2QmBK3mG9yK23z0yrS3eIY74=";



  patches = [

    ./allow-warnings.patch