cargo-bisect-rustc: 0.6.3 -> 0.6.4
This commit is contained in:
parent
06eccdaa8b
commit
0e80a8aedf
|
@ -1,22 +1,22 @@
|
|||
diff --git a/src/toolchains.rs b/src/toolchains.rs
|
||||
index 4d85e7c..b1353c6 100644
|
||||
index 53a7ddb..795a711 100644
|
||||
--- a/src/toolchains.rs
|
||||
+++ b/src/toolchains.rs
|
||||
@@ -259,6 +259,8 @@ impl Toolchain {
|
||||
.map_err(InstallError::Download)?;
|
||||
@@ -206,6 +206,8 @@ impl Toolchain {
|
||||
})?;
|
||||
}
|
||||
|
||||
|
||||
+ nix_patchelf(tmpdir.path().to_path_buf())
|
||||
+ .expect("failed to patch toolchain for NixOS");
|
||||
fs::rename(tmpdir.into_path(), dest).map_err(InstallError::Move)?;
|
||||
|
||||
Ok(())
|
||||
@@ -557,3 +559,42 @@ pub(crate) fn download_tarball(
|
||||
fs::rename(tmpdir.into_path(), dest).map_err(InstallError::Move)
|
||||
}
|
||||
|
||||
@@ -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");
|
||||
+
|
||||
+ for entry in toolchain_path.read_dir()? {
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-bisect-rustc";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TRcHeA4pOzODyzkQCGkdAWy3Bt2ltrOcpCMDu6n4k3k=";
|
||||
hash = "sha256-dJpdAg+A7TYm6bGq73aA15hIymbJ56ScyygQLiEboak=";
|
||||
};
|
||||
|
||||
patches =
|
||||
|
@ -46,7 +46,12 @@ rustPlatform.buildRustPackage rec {
|
|||
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; {
|
||||
description = "Bisects rustc, either nightlies or CI artifacts";
|
||||
|
|
Loading…
Reference in a new issue