Merge pull request #310673 from kiike/zhf/hmm

hmm: replace rustc-serialize version to unbreak build
This commit is contained in:
Weijia Wang 2024-05-11 10:49:45 +02:00 committed by GitHub
commit 4e9d164e01
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 1 deletions

View File

@ -14,11 +14,14 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-WPePzqZ2iGeJ7kzTj8eg7q1JEjw91WY7gViJJ46SLRY=";
};
cargoHash = "sha256-9Z49aPfcIdMfYCFAXsxFxcfhaLjtPod+nMFHDmvgDY0=";
cargoHash = "sha256-CQnM7pFnk4LcstKllhbeohbrggKV6MBQy03oq7DEkP4=";
nativeCheckInputs = [
perl
];
# FIXME: remove patch when upstream version of rustc-serialize is updated
# https://github.com/NixOS/nixpkgs/pull/310673
cargoPatches = [ ./rustc-serialize-fix.patch ];
preCheck = ''
export HOME=$(mktemp -d)

View File

@ -0,0 +1,16 @@
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"