about summary refs log tree commit diff
path: root/pkgs/aszlig/rustfmt
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/aszlig/rustfmt')
-rw-r--r--pkgs/aszlig/rustfmt/config.patch13
-rw-r--r--pkgs/aszlig/rustfmt/default.nix30
2 files changed, 0 insertions, 43 deletions
diff --git a/pkgs/aszlig/rustfmt/config.patch b/pkgs/aszlig/rustfmt/config.patch
deleted file mode 100644
index 6864b797..00000000
--- a/pkgs/aszlig/rustfmt/config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/tools/rustfmt/src/config/mod.rs b/src/tools/rustfmt/src/config/mod.rs
-index cd90e090..a6db6da1 100644
---- a/src/tools/rustfmt/src/config/mod.rs
-+++ b/src/tools/rustfmt/src/config/mod.rs
-@@ -282,7 +282,7 @@ impl Config {
-                 }
-             }
- 
--            Ok(None)
-+            Ok(Some(env!("DEFAULT_CONFIG_FILE").into()))
-         }
- 
-         match resolve_project_file(dir)? {
diff --git a/pkgs/aszlig/rustfmt/default.nix b/pkgs/aszlig/rustfmt/default.nix
deleted file mode 100644
index 9ec78bf9..00000000
--- a/pkgs/aszlig/rustfmt/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ rustfmt, runCommand, remarshal }:
-
-let
-  defaultConfig = {
-    format_code_in_doc_comments = true;
-    format_macro_matchers = true;
-    format_strings = true;
-    group_imports = "StdExternalCrate";
-    match_block_trailing_comma = true;
-    max_width = 79;
-    newline_style = "Unix";
-    normalize_doc_attributes = true;
-    overflow_delimited_expr = true;
-    reorder_impl_items = true;
-    unstable_features = true;
-    use_field_init_shorthand = true;
-    use_try_shorthand = true;
-    wrap_comments = true;
-  };
-
-in (rustfmt.override { asNightly = true; }).overrideAttrs (drv: {
-  patches = (drv.patches or []) ++ [ ./config.patch ];
-  DEFAULT_CONFIG_FILE = runCommand "rustfmt.conf" {
-    nativeBuildInputs = [ remarshal ];
-    value = builtins.toJSON defaultConfig;
-    passAsFile = [ "value" ];
-  } ''
-    json2toml "$valuePath" "$out"
-  '';
-})