diff options
author | William A. Kennington III <william@wkennington.com> | 2015-09-23 22:43:25 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-09-23 22:43:25 -0700 |
commit | d5395b05060d37b73966a30d7e5552a6461d168a (patch) | |
tree | adb576d676a01b85d8ea037ff0d24fa93c11c2b4 | |
parent | 9c345fc97d15d34655759fb5076eab162098b138 (diff) | |
parent | 760be9cf7025a1a30b7e7c73a3935a652f098f2d (diff) |
Merge pull request #10024 from mayflower/update-rust
Update rust and dependants
-rw-r--r-- | pkgs/development/compilers/rustc/head.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/cargo/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/tools/rust/rustfmt/default.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/rust-packages.nix | 6 |
4 files changed, 17 insertions, 16 deletions
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 045a47e88de60..016d09b3cf1a4 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -2,10 +2,10 @@ { stdenv, callPackage }: callPackage ./generic.nix { - shortVersion = "2015-09-21"; + shortVersion = "2015-09-23"; isRelease = false; - srcRev = "547fd5c11e6902e2f9748e7b46893211b36da421"; - srcSha = "10wklbxz6f4ga9q2rxghih18xdw6xm01bay6c13y72c4bwlnkm2w"; + srcRev = "b2f379cdc23aec5c5d0d62acfcc5a4a18ebf0e30"; + srcSha = "1z710f5vv9pbis1q96dc6kqvi0j7xgg95r5f5c3czbvndrxjwm03"; /* Rust is bootstrapped from an earlier built version. We need to fetch these earlier versions, which vary per platform. diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index 9ffc9b0cbb998..6d16cbf7405ca 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -1,20 +1,21 @@ { stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl , cmake, zlib }: -with ((import ./common.nix) { inherit stdenv; version = "0.3.0"; }); +with ((import ./common.nix) { inherit stdenv; version = "0.5.0"; }); with rustPlatform; buildRustPackage rec { inherit name version meta; + # Needs to use fetchgit instead of fetchFromGitHub to fetch submodules src = fetchgit { - url = "https://github.com/rust-lang/cargo.git"; - rev = "refs/tags/0.3.0"; - sha256 = "0p7p7yivydjkpqb53a8i7pjl719z3gxa6czi0255ccwsh6n9z793"; + url = "git://github.com/rust-lang/cargo"; + rev = "refs/tags/${version}"; + sha256 = "1wg7vr6fpk9n76ly65lf2z9w1dj5nhykffbwrv46lybd8m3r8x3w"; }; - depsSha256 = "1sgdr2akd9xrfmf5g0lbf842b2pdj1ymxk37my0cf2x349rjsf0w"; + depsSha256 = "1q92q63g9pz7fy9fhx8y0kqarsshmzv1dq18ki3hdd7d5pcbczna"; buildInputs = [ file curl pkgconfig python openssl cmake zlib ]; diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 1e735611782ab..1a2bf7ac01ce5 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchgit, rustUnstable, makeWrapper }: +{ stdenv, fetchgit, rustUnstable, makeWrapper }: with rustUnstable; buildRustPackage rec { - name = "rustfmt-git-2015-09-05"; + name = "rustfmt-git-2015-09-23"; src = fetchgit { url = https://github.com/nrc/rustfmt; - rev = "6c5d3500bb805b37865fe961a7054f8435d176fc"; - sha256 = "0y506viir1klzvspi49qawrfd2g12p9ff2fyy1ndba6zixf69a90"; + rev = "c14cfca0e3de3dfa5fd91d39a85c5b452e7756e3"; + sha256 = "0q72mfj2ph2n4cd0cs4p2mpyr2ixd6ss607kjlgfinjv6klk1i3b"; }; - depsSha256 = "1kfc9l176qkimaag9p650sfpaz50p263rw2021gq5kjw8cyndlx8"; + depsSha256 = "13i9qaia1wn18lgfl69rrxw7b24bq1bpqhdck2jzxpv3wi2xshlw"; meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index e79ff5ca57ef3..e5d7627630196 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2015-08-21"; - rev = "02e31a901d5f0942466ca7730431b547477126b1"; + version = "2015-09-23"; + rev = "14906530682acd6fa4bac6a8578f6fd1c1090081"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "0jppl2grir4wxc3da24h18h21kvh1wj0iff1b0z9vvx0a1iqp4gm"; + sha256 = "1ycrf8qb776lsgcw9rfz5r63rih2m35n4p4h76hq1dxgvp1f2awh"; }; in |