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

Merge pull request #8668 from telotortium/rustc-update-to-1.1.0

Browse Source 
rustc: 1.0.0 -> 1.1.0
This commit is contained in:
Ricardo M. Correia 2015-07-12 17:19:49 +02:00
commit 71c16443c7
7 changed files with 51 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/compilers/rustc/1.0.0.nix
View File

@ -1,16 +0,0 @@
{ stdenv, callPackage }:
callPackage ./generic.nix {
shortVersion = "1.0.0";
isRelease = true;
srcSha = "14brziw91d3r88fa1kvpvhap5ws4z8h2mas7h6k9lpsc2zl9blak";
snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec";
snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349";
snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234";
snapshotHashDarwin64 = "5f35d9c920b8083a7420ef8cf5b00d5ef3085dfa";
snapshotDate = "2015-03-27";
snapshotRev = "5520801";
patches = [
./patches/beta.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
configureFlags = [ "--release-channel=stable" ];
}

33
pkgs/development/compilers/rustc/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv, callPackage }:
callPackage ./generic.nix {
shortVersion = "1.1.0";
isRelease = true;
srcSha = "0lsfrclj5imxy6129ggya7rb2h04cgqq53f75z2jv40y5xk25sy8";
/* Rust is bootstrapped from an earlier built version. We need
to fetch these earlier versions, which vary per platform.
The shapshot info you want can be found at
https://github.com/rust-lang/rust/blob/{$shortVersion}/src/snapshots.txt
with the set you want at the top.
*/
# linux-i386
snapshotHashLinux686 = "0bc8cffdce611fb71fd7d3d8e7cdbfaf748a4f16";
# linux-x86_64
snapshotHashLinux64 = "94089740e48167c5975c92c139ae9c286764012f";
# macos-i386
snapshotHashDarwin686 = "54cc35e76497e6e94fddf38d6e40e9d168491ddb";
# macos-x86_64
snapshotHashDarwin64 = "43a1c1fba0d1dfee4c2ca310d506f8f5f51b3f6f";
snapshotDate = "2015-04-27";
snapshotRev = "857ef6e";
patches = [
./patches/beta.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
configureFlags = [ "--release-channel=stable" ];
}

2
pkgs/development/compilers/rustc/generic.nix
View File

@ -62,7 +62,7 @@ let version = if isRelease then
meta = with stdenv.lib; {
homepage = http://www.rust-lang.org/;
description = "A safe, concurrent, practical language";
maintainers = with maintainers; [ madjar cstrahan wizeman globin ];
maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy ];
license = [ licenses.mit licenses.asl20 ];
platforms = platforms.linux;
};

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

@ -1,7 +1,7 @@
{ stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
, cmake, zlib }:
with ((import ./common.nix) { inherit stdenv; version = "2015-05-13"; });
with ((import ./common.nix) { inherit stdenv; version = "0.3.0"; });
with rustPlatform;
@ -10,12 +10,12 @@ buildRustPackage rec {
src = fetchgit {
url = "https://github.com/rust-lang/cargo.git";
rev = "d814fcbf8efda3027d54c09e11aa7eaf0006a83c";
sha256 = "0sppd3x2cacmbnypcjip44amnh66lrrbwwzsbz8rqf3nq2ah496x";
rev = "refs/tags/0.3.0";
sha256 = "1ckb2xd7nm8357imw6b1ci2ar8grnihzan94kvmjrijq6sz8yv9i";
leaveDotGit = true;
};
depsSha256 = "1b0mpdxmp7inkg59n2phjwzpz5gx22wqg9rfd1s01a5ylara37jw";
depsSha256 = "1sgdr2akd9xrfmf5g0lbf842b2pdj1ymxk37my0cf2x349rjsf0w";
buildInputs = [ file curl pkgconfig python openssl cmake zlib ];

10
pkgs/development/tools/build-managers/cargo/snapshot.nix
View File

@ -2,19 +2,19 @@
/* Cargo binary snapshot */
let snapshotDate = "2015-04-02";
let snapshotDate = "2015-06-17";
in
with ((import ./common.nix) { inherit stdenv; version = "snapshot-${snapshotDate}"; });
let snapshotHash = if stdenv.system == "i686-linux"
then "ba6c162680d5509d89ba2363d7cae2047f40c034"
then "g2h9l35123r72hqdwayd9h79kspfb4y9"
else if stdenv.system == "x86_64-linux"
then "94f715c9a52809a639f2ce6f8b1d5215a0c272b5"
then "fnx2rf1j8zvrplcc7xzf89czn0hf3397"
else if stdenv.system == "i686-darwin"
then "cf333f16f89bfd50e8ce461c6f81ca30d33f7f73"
then "3viz3fi2jx18qjwrc90nfhm9cik59my6"
else if stdenv.system == "x86_64-darwin"
then "1f7008a6ec860e2bc7580e71bdf320ac518ddeb8"
then "h2bf3db4vwz5cjjkn98lxayivdc6dflp"
else throw "no snapshot for platform ${stdenv.system}";
snapshotName = "cargo-nightly-${platform}.tar.gz";
in

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

@ -4653,7 +4653,7 @@ let
};
rustcMaster = callPackage ../development/compilers/rustc/head.nix {};
rustc = callPackage ../development/compilers/rustc/1.0.0.nix {};
rustc = callPackage ../development/compilers/rustc/default.nix {};
rustPlatform = rustStable;
@ -4661,7 +4661,7 @@ let
rustUnstable = recurseIntoAttrs (makeRustPlatform rustcMaster cargo rustUnstable);
# rust platform to build cargo itself (with cargoSnapshot)
rustCargoPlatform = makeRustPlatform rustcMaster cargoSnapshot rustCargoPlatform;
rustCargoPlatform = makeRustPlatform rustc cargoSnapshot.cargo rustCargoPlatform;
makeRustPlatform = rustc: cargo: self:
let
@ -5316,7 +5316,9 @@ let
rustPlatform = rustCargoPlatform;
};
cargoSnapshot = callPackage ../development/tools/build-managers/cargo/snapshot.nix { };
cargoSnapshot = {
cargo = callPackage ../development/tools/build-managers/cargo/snapshot.nix { };
};
casperjs = callPackage ../development/tools/casperjs { };

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

@ -7,15 +7,15 @@
{ runCommand, fetchFromGitHub, git }:
let
version = "2015-06-12";
rev = "020d1f3344ed8e7bd8fa740372bb7f03675fa708";
version = "2015-07-07";
rev = "fd9e3e4a350f5df0d975913bcc29d2051a509199";
src = fetchFromGitHub {
inherit rev;
owner = "rust-lang";
repo = "crates.io-index";
sha256 = "0vkr0k1ga0jskvl8ss7m5m66b4wwi7ibjj5qw0x0khcg1b5skkq6";
sha256 = "1vm28gfq4fmialz5ab8cxk5q1kdf6hlg3ni41qpy9k61pp9bqdwr";
};
in