cargo-bisect-rustc: 0.6.3 -> 0.6.4

+18 -13
+10 -10
pkgs/development/tools/rust/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch
··· 1 1 diff --git a/src/toolchains.rs b/src/toolchains.rs 2 - index 4d85e7c..b1353c6 100644 2 + index 53a7ddb..795a711 100644 3 3 --- a/src/toolchains.rs 4 4 +++ b/src/toolchains.rs 5 - @@ -259,6 +259,8 @@ impl Toolchain { 6 - .map_err(InstallError::Download)?; 5 + @@ -206,6 +206,8 @@ impl Toolchain { 6 + })?; 7 7 } 8 - 8 + 9 9 + nix_patchelf(tmpdir.path().to_path_buf()) 10 10 + .expect("failed to patch toolchain for NixOS"); 11 - fs::rename(tmpdir.into_path(), dest).map_err(InstallError::Move)?; 12 - 13 - Ok(()) 14 - @@ -557,3 +559,42 @@ pub(crate) fn download_tarball( 11 + fs::rename(tmpdir.into_path(), dest).map_err(InstallError::Move) 15 12 } 16 - download_tar_gz(client, name, &format!("{}.gz", url,), strip_prefix, dest) 13 + 14 + @@ -533,3 +535,42 @@ fn download_tarball( 15 + res => res, 16 + } 17 17 } 18 18 + 19 - +fn nix_patchelf(mut toolchain_path: PathBuf) -> Result<(), Error> { 19 + +fn nix_patchelf(mut toolchain_path: PathBuf) -> io::Result<()> { 20 20 + toolchain_path.push("bin"); 21 21 + 22 22 + for entry in toolchain_path.read_dir()? {
+8 -3
pkgs/development/tools/rust/cargo-bisect-rustc/default.nix
··· 12 12 13 13 rustPlatform.buildRustPackage rec { 14 14 pname = "cargo-bisect-rustc"; 15 - version = "0.6.3"; 15 + version = "0.6.4"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "rust-lang"; 19 19 repo = pname; 20 20 rev = "v${version}"; 21 - hash = "sha256-TRcHeA4pOzODyzkQCGkdAWy3Bt2ltrOcpCMDu6n4k3k="; 21 + hash = "sha256-dJpdAg+A7TYm6bGq73aA15hIymbJ56ScyygQLiEboak="; 22 22 }; 23 23 24 24 patches = ··· 46 46 Security 47 47 ]; 48 48 49 - cargoSha256 = "sha256-3I5V/JOxxy1+Cwkq9tuHMgHQ0eCfzAViJ4Gl+l8RHlE="; 49 + cargoHash = "sha256-Y/CQcIgdG8dCvPF5bmJDySmgzRi6lFU/aJxkyUjYlAM="; 50 + 51 + checkFlags = [ 52 + "--skip cli_tests" # https://github.com/rust-lang/cargo-bisect-rustc/issues/226 53 + "--skip test_github" # requires internet 54 + ]; 50 55 51 56 meta = with lib; { 52 57 description = "Bisects rustc, either nightlies or CI artifacts";