Unverified Commit 66d8535f authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #311897 from kiike/zhf/dtool 

dtool: replace rustc-serialize version to unbreak build
parents 371b127d 7eeb4f5f

pkgs/tools/misc/dtool/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -16,11 +16,13 @@ rustPlatform.buildRustPackage rec { 
    hash = "sha256-m4H+ANwEbK6vGW3oIVZqnqvMiAKxNJf2TLIGh/G6AU4=";

  };



  cargoHash = "sha256-r8r3f4yKMQgjtB3j4qE7cqQL18nIqAGPO5RsFErqh2c=";

  cargoHash = "sha256-o5Xvc0tnoUgfp5k7EqVuEH9Zyo3C+A+mVqPhMtZCYKw=";



  buildInputs = lib.optionals stdenv.isDarwin [

    darwin.apple_sdk.frameworks.Security

  ];

  # FIXME: remove patch when upstream version of rustc-serialize is updated

  cargoPatches = [ ./rustc-serialize-fix.patch ];



  checkType = "debug";

pkgs/tools/misc/dtool/rustc-serialize-fix.patch

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

index b1cc23695b30..ffdeb1c90618 100644

--- a/Cargo.lock

+++ b/Cargo.lock

@@ -996,9 +996,9 @@ dependencies = [

 

 [[package]]

 name = "rustc-serialize"

-version = "0.3.24"

+version = "0.3.25"

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

-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"

+checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401"

 

 [[package]]

 name = "rustix"