From a9326f6f345c79fa29f428410ed256763c4fd263 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Sun, 20 Mar 2016 16:46:23 -0400 Subject: [PATCH] cargoMaster: 2016-02-25 -> 2016-03-22 --- pkgs/development/tools/build-managers/cargo/head.nix | 8 ++++---- .../tools/build-managers/cargo/snapshot.nix | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/build-managers/cargo/head.nix b/pkgs/development/tools/build-managers/cargo/head.nix index 298177296a6c..570e96eedebd 100644 --- a/pkgs/development/tools/build-managers/cargo/head.nix +++ b/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 ]; diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix index 6dbe1e727d31..4a779cc456e9 100644 --- a/pkgs/development/tools/build-managers/cargo/snapshot.nix +++ b/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