cargoSnapshot: 2015-04-02 -> 2015-06-17, hide from nix-env

Update snapshot to avoid rust-lang/cargo#976, which otherwise breaks the
build.

Also move the `cargoSnapshot` derivation inside a set in
pkgs/top-level/all-packages.nix in order to hide the `cargo-snapshot`
packages from `nix-env -qa`, since it's only used to build the `cargo`
package.

2 files changed, 9 insertions, 7 deletions

diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix
index a76fb4601e8..f24bcc2d9ab 100644
--- a/pkgs/development/tools/build-managers/cargo/snapshot.nix
+++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix
@@ -2,19 +2,19 @@
 
 /* Cargo binary snapshot */
 
-let snapshotDate = "2015-04-02";
+let snapshotDate = "2015-06-17";
 in
 
 with ((import ./common.nix) { inherit stdenv; version = "snapshot-${snapshotDate}"; });
 
 let snapshotHash = if stdenv.system == "i686-linux"
-      then "ba6c162680d5509d89ba2363d7cae2047f40c034"
+      then "g2h9l35123r72hqdwayd9h79kspfb4y9"
       else if stdenv.system == "x86_64-linux"
-      then "94f715c9a52809a639f2ce6f8b1d5215a0c272b5"
+      then "fnx2rf1j8zvrplcc7xzf89czn0hf3397"
       else if stdenv.system == "i686-darwin"
-      then "cf333f16f89bfd50e8ce461c6f81ca30d33f7f73"
+      then "3viz3fi2jx18qjwrc90nfhm9cik59my6"
       else if stdenv.system == "x86_64-darwin"
-      then "1f7008a6ec860e2bc7580e71bdf320ac518ddeb8"
+      then "h2bf3db4vwz5cjjkn98lxayivdc6dflp"
       else throw "no snapshot for platform ${stdenv.system}";
     snapshotName = "cargo-nightly-${platform}.tar.gz";
 in
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74b49c60a7b..b8ee263f169 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4661,7 +4661,7 @@ let
   rustUnstable = recurseIntoAttrs (makeRustPlatform rustcMaster cargo rustUnstable);
 
   # rust platform to build cargo itself (with cargoSnapshot)
-  rustCargoPlatform = makeRustPlatform rustc cargoSnapshot rustCargoPlatform;
+  rustCargoPlatform = makeRustPlatform rustc cargoSnapshot.cargo rustCargoPlatform;
 
   makeRustPlatform = rustc: cargo: self:
     let
@@ -5316,7 +5316,9 @@ let
     rustPlatform = rustCargoPlatform;
   };
 
-  cargoSnapshot = callPackage ../development/tools/build-managers/cargo/snapshot.nix { };
+  cargoSnapshot = {
+    cargo = callPackage ../development/tools/build-managers/cargo/snapshot.nix { };
+  };
 
   casperjs = callPackage ../development/tools/casperjs { };