diff options
| author | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-05-28 12:48:05 +0200 |
|---|---|---|
| committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-05-28 15:05:11 +0200 |
| commit | 303aac8381bcc2509b0313a05d7f43e125d4a0c2 (patch) | |
| tree | 658139399c0673bfde6a79bcbc27136d2917b7de | |
| parent | 1e04865e87c6d807db231a7ea485164c9c6cdecd (diff) | |
| download | nixlib-303aac8381bcc2509b0313a05d7f43e125d4a0c2.tar nixlib-303aac8381bcc2509b0313a05d7f43e125d4a0c2.tar.gz nixlib-303aac8381bcc2509b0313a05d7f43e125d4a0c2.tar.bz2 nixlib-303aac8381bcc2509b0313a05d7f43e125d4a0c2.tar.lz nixlib-303aac8381bcc2509b0313a05d7f43e125d4a0c2.tar.xz nixlib-303aac8381bcc2509b0313a05d7f43e125d4a0c2.tar.zst nixlib-303aac8381bcc2509b0313a05d7f43e125d4a0c2.zip | |
cargo: 0.9.0 -> 0.10.0, rustRegistry: 2016-05-12 -> 2016-05-28.
| -rw-r--r-- | pkgs/development/tools/build-managers/cargo/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/rust-packages.nix | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index 2d7cdc365040..54909ce3b704 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -7,7 +7,7 @@ with rustPlatform; with ((import ./common.nix) { inherit stdenv rustc; - version = "0.9.0"; + version = "0.10.0"; }); buildRustPackage rec { @@ -17,10 +17,10 @@ buildRustPackage rec { src = fetchgit { url = "git://github.com/rust-lang/cargo"; rev = "refs/tags/${version}"; - sha256 = "0d3n2jdhaz06yhilvmw3m2avxv501da1hdhljc9mwkz3l5bkv2jv"; + sha256 = "06scvx5qh60mgvlpvri9ig4np2fsnicsfd452fi9w983dkxnz4l2"; }; - depsSha256 = "1x2m7ww2z8nl5ic2nds85p7ma8x0zp654jg7ay905ia95daiabzg"; + depsSha256 = "0js4697n7v93wnqnpvamhp446w58llj66za5hkd6wannmc0gsy3b"; buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ] ++ lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 7eb902ef28c6..31eb3007daae 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-05-12"; - rev = "5b7ac517f63cfc380f018445920aac322ae19b6f"; + version = "2016-05-28"; + rev = "eb354be1bc4c368e4ed885bd126f625f371b4bfa"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "0g50hjbvfjgi7j26b9n018vgh7sxvzq8lwzchk0zavirsxhnzxni"; + sha256 = "1scbfraj2cgpi5q1bkhhj18jv58hkyl9pms8qnx3fvxs6yq68ba9"; }; in @@ -44,4 +44,6 @@ runCommand "rustRegistry-${version}-${builtins.substring 0 7 rev}" { inherit src $git config --local user.name "example" $git add . $git commit -m 'Rust registry commit' + + touch $out/touch . "$out/.cargo-index-lock" '' |