cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

cargo-bisect-rustc: 0.6.3 -> 0.6.4

Browse source
This commit is contained in:
Theodore Ni 2022-10-05 16:58:25 -07:00
parent 06eccdaa8b
commit 0e80a8aedf
No known key found for this signature in database
GPG key ID: 48B67583BDDD4474
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/tools/rust/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch
View file

@ -1,22 +1,22 @@
diff --git a/src/toolchains.rs b/src/toolchains.rs diff --git a/src/toolchains.rs b/src/toolchains.rs
index 4d85e7c..b1353c6 100644 index 53a7ddb..795a711 100644
--- a/src/toolchains.rs --- a/src/toolchains.rs
+++ b/src/toolchains.rs +++ b/src/toolchains.rs
@@ -259,6 +259,8 @@ impl Toolchain { @@ -206,6 +206,8 @@ impl Toolchain {
.map_err(InstallError::Download)?; })?;
} }
+ nix_patchelf(tmpdir.path().to_path_buf()) + nix_patchelf(tmpdir.path().to_path_buf())
+ .expect("failed to patch toolchain for NixOS"); + .expect("failed to patch toolchain for NixOS");
fs::rename(tmpdir.into_path(), dest).map_err(InstallError::Move)?; fs::rename(tmpdir.into_path(), dest).map_err(InstallError::Move)
}
Ok(())
@@ -557,3 +559,42 @@ pub(crate) fn download_tarball( @@ -533,3 +535,42 @@ fn download_tarball(
res => res,
} }
download_tar_gz(client, name, &format!("{}.gz", url,), strip_prefix, dest)
} }
+ +
+fn nix_patchelf(mut toolchain_path: PathBuf) -> Result<(), Error> { +fn nix_patchelf(mut toolchain_path: PathBuf) -> io::Result<()> {
+ toolchain_path.push("bin"); + toolchain_path.push("bin");
+ +
+ for entry in toolchain_path.read_dir()? { + for entry in toolchain_path.read_dir()? {

11
pkgs/development/tools/rust/cargo-bisect-rustc/default.nix
View file

@ -12,13 +12,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-bisect-rustc"; pname = "cargo-bisect-rustc";
version = "0.6.3"; version = "0.6.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rust-lang"; owner = "rust-lang";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-TRcHeA4pOzODyzkQCGkdAWy3Bt2ltrOcpCMDu6n4k3k="; hash = "sha256-dJpdAg+A7TYm6bGq73aA15hIymbJ56ScyygQLiEboak=";
}; };
patches = patches =
@ -46,7 +46,12 @@ rustPlatform.buildRustPackage rec {
Security Security
]; ];
cargoSha256 = "sha256-3I5V/JOxxy1+Cwkq9tuHMgHQ0eCfzAViJ4Gl+l8RHlE="; cargoHash = "sha256-Y/CQcIgdG8dCvPF5bmJDySmgzRi6lFU/aJxkyUjYlAM=";
checkFlags = [
"--skip cli_tests" # https://github.com/rust-lang/cargo-bisect-rustc/issues/226
"--skip test_github" # requires internet
];
meta = with lib; { meta = with lib; {
description = "Bisects rustc, either nightlies or CI artifacts"; description = "Bisects rustc, either nightlies or CI artifacts";