diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-05-16 09:33:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-16 09:33:25 +0200 |
| commit | 66d8535f67ea470b7d036a6c2a72616909152d9c (patch) | |
| tree | 7ae0b76d5de50b7e216617d02e76a41a3a64adc2 /pkgs | |
| parent | 371b127de0cc1cc2c25753d0d6a9b0d06e2aee1c (diff) | |
| parent | 7eeb4f5f1788aaf6a362bb8fab40ceae08bcd957 (diff) | |
Merge pull request #311897 from kiike/zhf/dtool
dtool: replace rustc-serialize version to unbreak build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/dtool/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/dtool/rustc-serialize-fix.patch | 16 |
2 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/tools/misc/dtool/default.nix b/pkgs/tools/misc/dtool/default.nix index 9cf22a9da39f3..8fdb2f533d47f 100644 --- a/pkgs/tools/misc/dtool/default.nix +++ b/pkgs/tools/misc/dtool/default.nix @@ -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"; diff --git a/pkgs/tools/misc/dtool/rustc-serialize-fix.patch b/pkgs/tools/misc/dtool/rustc-serialize-fix.patch new file mode 100644 index 0000000000000..8d0327e8a4578 --- /dev/null +++ b/pkgs/tools/misc/dtool/rustc-serialize-fix.patch @@ -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" |