colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cargo: 0.9.0 -> 0.10.0, rustRegistry: 2016-05-12 -> 2016-05-28.

Browse Source
This commit is contained in:
Moritz Ulrich 2016-05-28 12:48:05 +02:00
parent 1e04865e87
commit 303aac8381
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/build-managers/cargo/default.nix
View File

@ -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;

8
pkgs/top-level/rust-packages.nix
View File

@ -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"
''