From b7d3d76a9353033690cedc6cdd0c1308cb76040a Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 2 Oct 2025 03:02:09 +0400 Subject: [PATCH] =?UTF-8?q?rustc-demangle:=200.1.20=20=E2=86=92=200.1.26,?= =?UTF-8?q?=20enable=20on=20darwin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ru/rustc-demangle/Cargo.lock | 132 ++++++++++++++++----- pkgs/by-name/ru/rustc-demangle/package.nix | 21 ++-- 2 files changed, 114 insertions(+), 39 deletions(-) diff --git a/pkgs/by-name/ru/rustc-demangle/Cargo.lock b/pkgs/by-name/ru/rustc-demangle/Cargo.lock index 0268b3bdd463..2a63ecb1553d 100644 --- a/pkgs/by-name/ru/rustc-demangle/Cargo.lock +++ b/pkgs/by-name/ru/rustc-demangle/Cargo.lock @@ -1,53 +1,91 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arbitrary" -version = "1.0.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237430fd6ed3740afe94eefcc278ae21e050285be882804e0d6e8695f0c94691" +checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" [[package]] name = "cc" -version = "1.0.69" +version = "1.2.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" - -[[package]] -name = "compiler_builtins" -version = "0.1.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b1438ef42c655665a8ab2c1c6d605a305f031d38d9be689ddfef41a20f3aa2" - -[[package]] -name = "libfuzzer-sys" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36a9a84a6e8b55dfefb04235e55edb2b9a2a18488fcae777a6bdaa6f06f1deb3" +checksum = "e1354349954c6fc9cb0deab020f27f783cf0b604e8bb754dc4658ecf0d29c35f" dependencies = [ - "arbitrary", - "cc", - "once_cell", + "find-msvc-tools", + "jobserver", + "libc", + "shlex", ] [[package]] -name = "once_cell" -version = "1.8.0" +name = "cfg-if" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" + +[[package]] +name = "find-msvc-tools" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ced73b1dacfc750a6db6c0a0c3a3853c8b41997e2e2c563dc90804ae6867959" + +[[package]] +name = "getrandom" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi", +] + +[[package]] +name = "jobserver" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +dependencies = [ + "getrandom", + "libc", +] + +[[package]] +name = "libc" +version = "0.2.176" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" + +[[package]] +name = "libfuzzer-sys" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404" +dependencies = [ + "arbitrary", + "cc", +] + +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" [[package]] name = "rustc-demangle" -version = "0.1.20" +version = "0.1.26" dependencies = [ - "compiler_builtins", "rustc-std-workspace-core", ] [[package]] name = "rustc-demangle-capi" -version = "0.1.0" +version = "0.1.2" dependencies = [ "rustc-demangle", ] @@ -58,10 +96,48 @@ version = "0.0.0" dependencies = [ "libfuzzer-sys", "rustc-demangle", + "rustc-demangle-native-c", +] + +[[package]] +name = "rustc-demangle-native-c" +version = "0.1.0" +dependencies = [ + "cc", ] [[package]] name = "rustc-std-workspace-core" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1956f5517128a2b6f23ab2dadf1a976f4f5b27962e7724c2bf3d45e539ec098c" +checksum = "aa9c45b374136f52f2d6311062c7146bff20fec063c3f5d46a410bd937746955" + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "wasi" +version = "0.14.7+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c" +dependencies = [ + "wasip2", +] + +[[package]] +name = "wasip2" +version = "1.0.1+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wit-bindgen" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" diff --git a/pkgs/by-name/ru/rustc-demangle/package.nix b/pkgs/by-name/ru/rustc-demangle/package.nix index 9a868684f80d..27252eca2452 100644 --- a/pkgs/by-name/ru/rustc-demangle/package.nix +++ b/pkgs/by-name/ru/rustc-demangle/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "rustc-demangle"; - version = "0.1.20"; + version = "0.1.26"; src = fetchFromGitHub { - owner = "alexcrichton"; + owner = "rust-lang"; repo = "rustc-demangle"; - rev = version; - sha256 = "sha256-elxclyuLmr3N66s+pR4/6OU98k1oXI2wKVJtzWPY8FI="; + tag = "rustc-demangle-v${version}"; + hash = "sha256-4/x3kUIKi3xnDRznr+6xmPeWHmhlpbuwSNH3Ej6+Ifc="; }; cargoLock = { @@ -32,19 +32,18 @@ rustPlatform.buildRustPackage rec { postInstall = '' mkdir -p $out/lib - cp target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc_demangle.so $out/lib + cp target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc_demangle${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib cp -R crates/capi/include $out ''; - meta = with lib; { + meta = { description = "Rust symbol demangling"; - homepage = "https://github.com/alexcrichton/rustc-demangle"; - license = with licenses; [ + homepage = "https://github.com/rust-lang/rustc-demangle"; + license = with lib.licenses; [ asl20 mit ]; - # upstream supports other platforms, but maintainer can only test on linux - platforms = platforms.linux; - maintainers = with maintainers; [ _1000teslas ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ _1000teslas ]; }; }