From 2ede3e6dddf6610b284ad4cc80723af2a7cbd324 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 2 Nov 2015 02:04:41 +0100
Subject: [PATCH 1/2] rustfmt: 2015-10-17 -> 2015-10-28

... which also fixes the build.
Also, I've switched the compiler to the stable channel since rustfmt
supports it now.
---
 pkgs/development/tools/rust/rustfmt/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix
index c72668540b3..876734a3e11 100644
--- a/pkgs/development/tools/rust/rustfmt/default.nix
+++ b/pkgs/development/tools/rust/rustfmt/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, rustUnstable, makeWrapper }:
+{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
 
-with rustUnstable;
+with rustPlatform;
 
 buildRustPackage rec {
-  name = "rustfmt-git-2015-10-17";
+  name = "rustfmt-git-2015-10-28";
   src = fetchFromGitHub {
     owner = "nrc";
     repo = "rustfmt";
-    rev = "36c9a3acf95a036f3f9fa72ff3fe175fba55e20b";
-    sha256 = "1vjnfq3al73qljalr2rvymabcksx6y690gg5r9kgz1lnizlb7yrz";
+    rev = "bd0fdbb364ba69c69b867f96bc1ea9b59177fb76";
+    sha256 = "07yxz409yxgwrzm46fhq6kyn9igznb7481kxyk90ngmhdd0a5mfd";
   };
 
-  depsSha256 = "0vzpq58vfswdwdm2bk44ynk43cmwdxppcbkvpjyfa6sjs2s5x8n9";
+  depsSha256 = "0qs6ilpvcrvcmxg7a94rbg9rql1hxfljy6gxrvpn59dy8hb1qccb";
 
   meta = with stdenv.lib; {
     description = "A tool for formatting Rust code according to style guidelines";

From 2389a707afb9bd03501a4a9e8fc17b91eb52d962 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 2 Nov 2015 14:50:14 +0100
Subject: [PATCH 2/2] fetch-cargo-deps: add debug output

... so that we can find out why there are sporadic hash mismatches.
---
 pkgs/build-support/rust/fetch-cargo-deps | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps
index 04d33c60d30..b119be273ba 100755
--- a/pkgs/build-support/rust/fetch-cargo-deps
+++ b/pkgs/build-support/rust/fetch-cargo-deps
@@ -172,3 +172,8 @@ done)
 # Remove unneeded outputs
 [[ ! -d $out/registry/src ]] || rm -rf $out/registry/src
 [[ ! -d $out/git/checkouts ]] || rm -rf $out/git/checkouts
+
+# XXX: provide some debugging output to see find out why we are seeing
+# sporadic hash mismatches
+find $out ! -type f
+find $out -type f -exec sha256sum {} +