Merge pull request #22403 from retrry/master

rustc, cargo: 1.14.0 -> 1.15.0, 0.15 -> 0.16
This commit is contained in:
Rushmore Mushambi 2017-02-04 03:00:45 +02:00 committed by GitHub
commit e4fe2165a0
5 changed files with 19 additions and 44 deletions

View file

@ -14,16 +14,16 @@ let
then "x86_64-apple-darwin"
else abort "missing boostrap url for platform ${stdenv.system}";
# fetch hashes by running `print-hashes.sh 1.13.0`
# fetch hashes by running `print-hashes.sh 1.14.0`
bootstrapHash =
if stdenv.system == "i686-linux"
then "239734113f6750d31085c7a08c260d492991cc1ef10817b6d44154515f3f9439"
then "8d5c75728b44468216f99651dfae9d60ae0696a77105dd2b02942d75f3256840"
else if stdenv.system == "x86_64-linux"
then "95f4c372b1b81ac1038161e87e932dd7ab875d25c167a861c3949b0f6a65516d"
then "c71325cfea1b6f0bdc5189fa4c50ff96f828096ff3f7b5056367f9685d6a4d04"
else if stdenv.system == "i686-darwin"
then "f6e01cab3bf8d0a6fe9cc2447aa10ce894569daaa72d44063c229da918b96023"
then "fe1b3d67329a22d67e3b8db8858a43022e2e746dde60ef4a2db3f2cac16ea9bd"
else if stdenv.system == "x86_64-darwin"
then "f538ca5732b844cf7f00fc4aaaf200a49a845b58b4ec8aef38da0b00e2cf6efe"
then "3381341524b0184da5ed2cdcddc2a25e2e335e87f1cf676f64d98ee5e6479f20"
else throw "missing boostrap hash for platform ${stdenv.system}";
needsPatchelf = stdenv.isLinux;
@ -33,7 +33,7 @@ let
sha256 = bootstrapHash;
};
version = "1.13.0";
version = "1.14.0";
in
rec {

View file

@ -6,15 +6,14 @@ let
in
rec {
rustc = callPackage ./rustc.nix {
shortVersion = "1.14";
shortVersion = "1.15";
isRelease = true;
forceBundledLLVM = false;
configureFlags = [ "--release-channel=stable" ];
srcRev = "e8a0123241f0d397d39cd18fcc4e5e7edde22730";
srcSha = "1sla3gnx9dqvivnyhvwz299mc3jmdy805q2y5xpmpi1vhfk0bafx";
srcRev = "10893a9a349cdd423f2490a6984acb5b3b7c8046";
srcSha = "0861iivb98ir9ixq2qzznfc1b2l9khlwdln5n0gf2mp1fi3w4d4f";
patches = [
./patches/disable-lockfile-check-stable.patch
./patches/darwin-disable-fragile-tcp-tests.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
@ -25,10 +24,10 @@ rec {
};
cargo = callPackage ./cargo.nix rec {
version = "0.15.0";
srcRev = "298a0127f703d4c2500bb06d309488b92ef84ae1";
srcSha = "0v74r18vszapw2rfk7w72czkp9gbq4s1sggphm5vx0kyh058dxc5";
depsSha256 = "0ksiywli8r4lkprfknm0yz1w27060psi3db6wblqmi8sckzdm44h";
version = "0.16.0";
srcRev = "6e0c18cccc8b0c06fba8a8d76486f81a792fb420";
srcSha = "117ivvs9wz848mwf8bw797n10qpn77agd353z8b0hxgbxhpribya";
depsSha256 = "11s2xpgfhl4mb4wa2nk4mzsypr7m9daxxc7l0vraiz5cr77gk7qq";
inherit rustc; # the rustc that will be wrapped by cargo
inherit rustPlatform; # used to build cargo

View file

@ -1,26 +0,0 @@
From e7378e267bba203bd593b49705c24303b0a46cb7 Mon Sep 17 00:00:00 2001
From: David Craven <david@craven.ch>
Date: Wed, 1 Jun 2016 01:41:35 +0200
Subject: [PATCH] disable-lockfile-check
---
src/tools/tidy/src/main.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
index 2839bbd..50142ff 100644
--- a/src/tools/tidy/src/main.rs
+++ b/src/tools/tidy/src/main.rs
@@ -48,7 +48,7 @@ fn main() {
errors::check(&path, &mut bad);
cargo::check(&path, &mut bad);
features::check(&path, &mut bad);
- cargo_lock::check(&path, &mut bad);
+ //cargo_lock::check(&path, &mut bad);
pal::check(&path, &mut bad);
if bad {
panic!("some tidy checks failed");
--
2.8.3

View file

@ -56,6 +56,8 @@ stdenv.mkDerivation {
++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ]
# ++ [ "--jemalloc-root=${jemalloc}/lib"
++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ]
# TODO: Remove when fixed build with rustbuild
++ [ "--disable-rustbuild" ]
++ optional (stdenv.cc.cc ? isClang) "--enable-clang"
++ optional (targets != []) "--target=${target}"
++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";

View file

@ -4,16 +4,16 @@ with rustPlatform;
buildRustPackage rec {
name = "racerd-${version}";
version = "2016-08-23";
version = "2016-12-24";
src = fetchgit {
url = "git://github.com/jwilm/racerd.git";
rev = "5d685ed26ba812a1afe892a8c0d12eb6abbeeb3d";
sha256 = "1ww96nc00l8p28rnln31n92x0mp2p5jnaqh2nwc8xi3r559p1y5i";
rev = "dc090ea11d550cd513416d21227d558dbfd2fcb6";
sha256 = "0jfryb1b32m6bn620gd7y670cfipaswj1cppzkybm4xg6abqh07b";
};
doCheck = false;
depsSha256 = "13vkabr6bbl2nairxpn3lhqxcr3larasjk03r4hzrn7ff7sy40h2";
depsSha256 = "1vv6fyisi11bcajxkq3ihpl59yh504xmnsr222zj15hmivn0jwf2";
buildInputs = [ makeWrapper ];