Merge pull request #14088 from jgillich/rust-head

Rust updates

pkgs/development/tools/build-managers/cargo/head.nix

@@ -5,7 +5,7 @@ with rustPlatform;
 
 with ((import ./common.nix) {
   inherit stdenv rustc;
-  version = "2016-02-25";
+  version = "2016-03-20";
 });
 
 buildRustPackage rec {
@@ -14,11 +14,11 @@ buildRustPackage rec {
   # Needs to use fetchgit instead of fetchFromGitHub to fetch submodules
   src = fetchgit {
     url = "git://github.com/rust-lang/cargo";
-    rev = "e7212896dc1b182493a0252a2a126db8be067153";
-    sha256 = "1qbic7gp7cpihi40kfv3kagja8zsngica8sq9jcm9czb6ba44dsa";
+    rev = "132b82d75f607dcb1116b8d44fe60f202f1eb110";
+    sha256 = "0kx2m0p45zr0ils2ax19sr32cibjppgwj8xvsgrfvzvlnc540xpl";
   };
 
-  depsSha256 = "1xfpj1233p4314j6jmip0jjl5m3kj2wbac1ll3yvh7383zb83i1s";
+  depsSha256 = "19d2fl5p92108a0yjpix0qxdc23jy122xc87k69hk0pwwxa92l3a";
 
   buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ];
 

pkgs/development/tools/build-managers/cargo/snapshot.nix

@@ -2,7 +2,7 @@
 
 /* Cargo binary snapshot */
 
-let snapshotDate = "2015-06-17";
+let snapshotDate = "2016-01-31";
 in
 
 with ((import ./common.nix) {
@@ -11,13 +11,13 @@ with ((import ./common.nix) {
 });
 
 let snapshotHash = if stdenv.system == "i686-linux"
-      then "g2h9l35123r72hqdwayd9h79kspfb4y9"
+      then "7e2f9c82e1af5aa43ef3ee2692b985a5f2398f0a"
       else if stdenv.system == "x86_64-linux"
-      then "fnx2rf1j8zvrplcc7xzf89czn0hf3397"
+      then "4c03a3fd2474133c7ad6d8bb5f6af9915ca5292a"
       else if stdenv.system == "i686-darwin"
-      then "3viz3fi2jx18qjwrc90nfhm9cik59my6"
+      then "4d84d31449a5926f9e7ceb344540d6e5ea530b88"
       else if stdenv.system == "x86_64-darwin"
-      then "h2bf3db4vwz5cjjkn98lxayivdc6dflp"
+      then "f8baef5b0b3e6f9825be1f1709594695ac0f0abc"
       else throw "no snapshot for platform ${stdenv.system}";
     snapshotName = "cargo-nightly-${platform}.tar.gz";
 in

pkgs/development/tools/rust/rustfmt/default.nix

@@ -3,15 +3,17 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "rustfmt-git-2016-02-15";
+  name = "rustfmt-${version}";
+  version = "2016-03-22";
+
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rustfmt";
-    rev = "65bc5c242de86f0651b34fd913ca338a880696e8";
-    sha256 = "02rdim0y5zg1r2zkfy6kj53idlbdybf3ckardbjsvdna5idc1hpz";
+    rev = "ca757183fedf8e89286372b91ca074c11d99c4f4";
+    sha256 = "0ngg5m002hwwmsqy9wr50dj3l3zgwk39701wzszm3nrhz6x13dmj";
   };
 
-  depsSha256 = "1297vy5sgiq4xqdm27pa8f99qiwrl15hb2r1dydzgk7n4iqyir6c";
+  depsSha256 = "0mg4z197iiwjlgqs5izacld25cr11qi3bcrqq204f0jzrnj3y8ag";
 
   meta = with stdenv.lib; {
     description = "A tool for formatting Rust code according to style guidelines";