diff --git a/pkgs/development/compilers/rust/rustfmt-fix-self-tests.patch b/pkgs/development/compilers/rust/rustfmt-fix-self-tests.patch new file mode 100644 index 0000000000000..b60332daef44c --- /dev/null +++ b/pkgs/development/compilers/rust/rustfmt-fix-self-tests.patch @@ -0,0 +1,13 @@ +--- a/src/tools/rustfmt/src/ignore_path.rs ++++ b/src/tools/rustfmt/src/ignore_path.rs +@@ -37,9 +37,9 @@ + #[nightly_only_test] + #[test] + fn test_ignore_path_set() { +- use std::path::{Path, PathBuf}; + use crate::config::{Config, FileName}; + use crate::ignore_path::IgnorePathSet; ++ use std::path::{Path, PathBuf}; + + let config = + Config::from_toml(r#"ignore = ["foo.rs", "bar_dir/*"]"#, Path::new("")).unwrap(); diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index f8ac8bf39df38..9922d60ef7058 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec { CFG_RELEASE = rustPlatform.rust.rustc.version; CFG_RELEASE_CHANNEL = "stable"; + # FIXME: seems fixed upstream, remove after the next update + patches = [ ./rustfmt-fix-self-tests.patch ]; + meta = with lib; { description = "A tool for formatting Rust code according to style guidelines"; homepage = "https://github.com/rust-lang-nursery/rustfmt";