diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix
index 901fde593894..f0d8f92dfaa3 100644
--- a/pkgs/development/tools/build-managers/cargo/common.nix
+++ b/pkgs/development/tools/build-managers/cargo/common.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl, zlib}:
+{stdenv, version}:
 
-with stdenv.lib;
+{
+  inherit version;
 
-rec {
   platform = if stdenv.system == "i686-linux"
     then "i686-unknown-linux-gnu"
     else if stdenv.system == "x86_64-linux"
@@ -13,40 +13,12 @@ rec {
     then "x86_64-apple-darwin"
     else throw "no snapshot to bootstrap for this platform (missing platform url suffix)";
 
-  snapshotHash = if stdenv.system == "i686-linux"
-    then "ab8bba0918d3d2ddbd7fd21f147e223dbf04cece"
-    else if stdenv.system == "x86_64-linux"
-    then "0efe0f7bcbcbeb5494affcc8a2207db448a08c45"
-    else if stdenv.system == "i686-darwin"
-    then "e5097005b0a27c186b8edee24982fd4c3ebba81e"
-    else if stdenv.system == "x86_64-darwin"
-    then "6c0bb776e5645fb93b67341b111c715f39b25511"
-    else throw "no snapshot for platform ${stdenv.system}";
-
-  snapshotDate = "2014-12-30";
-  snapshotName = "cargo-nightly-${platform}.tar.gz";
-
-  snapshot = stdenv.mkDerivation {
-    name = "cargo-snapshot-${snapshotDate}";
-    src = fetchurl {
-      url = "https://static-rust-lang-org.s3.amazonaws.com/cargo-dist/${snapshotDate}/${snapshotName}";
-      sha1 = snapshotHash;
-    };
-    dontStrip = true;
-    installPhase = ''
-      mkdir -p "$out"
-      cp -r bin "$out/bin"
-    '' + (if stdenv.isLinux then ''
-      patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \
-               --set-rpath "${stdenv.cc.gcc}/lib/:${stdenv.cc.gcc}/lib64/:${zlib}/lib" \
-               "$out/bin/cargo"
-    '' else "");
-  };
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://crates.io;
     description = "Downloads your Rust project's dependencies and builds your project";
     license = [ licenses.mit licenses.asl20 ];
     platforms = platforms.linux;
   };
+
+  name = "cargo-${version}";
 }
diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix
index e86b19ca33eb..b873aee62f9e 100644
--- a/pkgs/development/tools/build-managers/cargo/snapshot.nix
+++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix
@@ -2,6 +2,42 @@
 
 /* Cargo binary snapshot */
 
-with ((import ./common.nix) { inherit stdenv fetchurl zlib; });
+let snapshotDate = "2014-12-30";
+in
 
-snapshot // { inherit meta; }
+with ((import ./common.nix) { inherit stdenv; version = "snapshot-${snapshotDate}"; });
+
+let snapshotHash = if stdenv.system == "i686-linux"
+      then "ab8bba0918d3d2ddbd7fd21f147e223dbf04cece"
+      else if stdenv.system == "x86_64-linux"
+      then "0efe0f7bcbcbeb5494affcc8a2207db448a08c45"
+      else if stdenv.system == "i686-darwin"
+      then "e5097005b0a27c186b8edee24982fd4c3ebba81e"
+      else if stdenv.system == "x86_64-darwin"
+      then "6c0bb776e5645fb93b67341b111c715f39b25511"
+      else throw "no snapshot for platform ${stdenv.system}";
+    snapshotName = "cargo-nightly-${platform}.tar.gz";
+in
+
+
+stdenv.mkDerivation {
+  inherit name;
+  inherit version;
+  inherit meta;
+
+  src = fetchurl {
+    url = "https://static-rust-lang-org.s3.amazonaws.com/cargo-dist/${snapshotDate}/${snapshotName}";
+    sha1 = snapshotHash;
+  };
+
+  dontStrip = true;
+
+  installPhase = ''
+    mkdir -p "$out"
+    cp -r bin "$out/bin"
+  '' + (if stdenv.isLinux then ''
+    patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \
+             --set-rpath "${stdenv.cc.gcc}/lib/:${stdenv.cc.gcc}/lib64/:${zlib}/lib" \
+             "$out/bin/cargo"
+  '' else "");
+}