diff --git a/Cargo.lock b/Cargo.lock index 3a888662f28fe5..1dc242683e4b2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8985,8 +8985,3 @@ dependencies = [ "cc", "libc", ] - -[[patch.unused]] -name = "ntapi" -version = "0.3.7" -source = "git+https://github.com/solana-labs/ntapi?rev=97ede981a1777883ff86d142b75024b023f04fad#97ede981a1777883ff86d142b75024b023f04fad" diff --git a/Cargo.toml b/Cargo.toml index 8cd11db7510fb1..58fcee9091ab41 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -411,10 +411,6 @@ zstd = "0.11.2" # for details, see https://github.com/solana-labs/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf crossbeam-epoch = { git = "https://github.com/solana-labs/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" } -# Rust 1.69+ broke ntapi v0.3.x, which doesn't contain proper fix: -# https://github.com/MSxDOS/ntapi/pull/12 -ntapi = { git = "https://github.com/solana-labs/ntapi", rev = "97ede981a1777883ff86d142b75024b023f04fad" } - # We include the following crates as our dependencies above from crates.io: # # * spl-associated-token-account diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 12db365a1165b3..8504681a1d9055 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -7906,8 +7906,3 @@ dependencies = [ "cc", "libc", ] - -[[patch.unused]] -name = "ntapi" -version = "0.3.7" -source = "git+https://github.com/solana-labs/ntapi?rev=97ede981a1777883ff86d142b75024b023f04fad#97ede981a1777883ff86d142b75024b023f04fad" diff --git a/programs/sbf/Cargo.toml b/programs/sbf/Cargo.toml index 6e584924fbb7d2..0d554e6e62c679 100644 --- a/programs/sbf/Cargo.toml +++ b/programs/sbf/Cargo.toml @@ -160,10 +160,6 @@ members = [ targets = ["x86_64-unknown-linux-gnu"] [patch.crates-io] -# Rust 1.69+ broke ntapi v0.3.x, which doesn't contain proper fix: -# https://github.com/MSxDOS/ntapi/pull/12 -ntapi = { git = "https://github.com/solana-labs/ntapi", rev = "97ede981a1777883ff86d142b75024b023f04fad" } - # We include the following crates as our dependencies from crates.io: # # * spl-associated-token-account diff --git a/scripts/cargo-install-all.sh b/scripts/cargo-install-all.sh index a71a480657aafe..67ca1665a14411 100755 --- a/scripts/cargo-install-all.sh +++ b/scripts/cargo-install-all.sh @@ -144,10 +144,7 @@ mkdir -p "$installDir/bin" if [[ -z "$validatorOnly" ]]; then # the patch-related configs are needed for rust 1.69+ on Windows; see Cargo.toml # shellcheck disable=SC2086 # Don't want to double quote $rust_version - "$cargo" $maybeRustVersion \ - --config 'patch.crates-io.ntapi.git="https://github.com/solana-labs/ntapi"' \ - --config 'patch.crates-io.ntapi.rev="97ede981a1777883ff86d142b75024b023f04fad"' \ - install --locked spl-token-cli --root "$installDir" + "$cargo" $maybeRustVersion install --locked spl-token-cli --root "$installDir" fi )