From 5c9bcdf21f2c02d1e53dde0fafb4279c69943ec4 Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 5 Feb 2023 12:28:51 -0500 Subject: [PATCH] rustc: apply patch to fix delay_span_bug ICE Rust 1.67.0 introduced a regression that caused an ICE when building Vector. https://hydra.nixos.org/build/207931877 https://github.com/rust-lang/rust/issues/107691 https://github.com/rust-lang/rust/pull/107688 --- pkgs/development/compilers/rust/1_67.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/compilers/rust/1_67.nix b/pkgs/development/compilers/rust/1_67.nix index b2a37aa95d8a38..a0a43f31386db9 100644 --- a/pkgs/development/compilers/rust/1_67.nix +++ b/pkgs/development/compilers/rust/1_67.nix @@ -66,6 +66,15 @@ import ./default.nix { url = "https://github.com/rust-lang/rust/commit/de363d54c40a378717881240e719f5f7223ba376.patch"; hash = "sha256-3Xb803LZUZ1dldxGJ65Iw6gg1V1K827OB/0b32GqilU="; }) + + # Fixes ICE. + # https://github.com/rust-lang/rust/pull/107688 + (fetchpatch { + name = "re-erased-regions-are-local.patch"; + url = "https://github.com/rust-lang/rust/commit/9d110847ab7f6aef56a8cd20cb6cea4fbcc51cd9.patch"; + excludes = [ "*tests/*" ]; + hash = "sha256-EZH5K1BEOOfi97xZr1xEHFP4jjvJ1+xqtRMvxBoL8pU="; + }) ]; }