diff options
| author | Cole Helbling <cole.e.helbling@outlook.com> | 2020-05-02 16:36:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-02 23:36:49 +0000 |
| commit | 440110b83ffe8391e726dfa8efa83c229372a779 (patch) | |
| tree | 28da6ceb038ff9403e958f05e075d2ec448d666e /pkgs/tools/nix | |
| parent | f2d1041b6b5ba35662d1ffd53d2cdfd89951807e (diff) | |
| download | nixpkgs-440110b83ffe8391e726dfa8efa83c229372a779.tar nixpkgs-440110b83ffe8391e726dfa8efa83c229372a779.tar.gz nixpkgs-440110b83ffe8391e726dfa8efa83c229372a779.tar.bz2 nixpkgs-440110b83ffe8391e726dfa8efa83c229372a779.tar.lz nixpkgs-440110b83ffe8391e726dfa8efa83c229372a779.tar.xz nixpkgs-440110b83ffe8391e726dfa8efa83c229372a779.tar.zst nixpkgs-440110b83ffe8391e726dfa8efa83c229372a779.zip | |
nixpkgs-fmt: fix erroneous debug output (#86335)
Prior to this, when used in conjunction with e.g. `format-all-mode`,
garbage like
node: NODE_STRING@[8934; 9139), indent: IndentLevel { level: 3, alignment: 0 }
would be written to the file.Diffstat (limited to 'pkgs/tools/nix')
| -rw-r--r-- | pkgs/tools/nix/nixpkgs-fmt/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix index b95bb46a844..b55ac647b35 100644 --- a/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "nixpkgs-fmt"; version = "0.8.0"; @@ -10,6 +10,15 @@ rustPlatform.buildRustPackage rec { sha256 = "09lhi8aidw9qf94n07mgs2nfac32a96wkx50glj35dhn06iwzwqr"; }; + patches = [ + # Fixes debug output on stdout mangling some files. Fixed in next release. + # https://github.com/nix-community/nixpkgs-fmt/issues/201 + (fetchpatch { + url = "https://github.com/nix-community/nixpkgs-fmt/commit/648f46e1d5507592b246311618f467da282bf1b5.patch"; + sha256 = "18n4criyl0lydxmjqfkcmwx0pniyqzfgfxcjwz6czqwmx5y7b4rb"; + }) + ]; + cargoSha256 = "15m40d9354412h51zn806pxsqjai48xiw8chf8slbi0cjxd268j9"; meta = with lib; { |