alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #14408 from retrry/rustc-update

Browse source 
rustc: 1.6.0 -> 1.7.0. Enable Darwin platform.
This commit is contained in:
zimbatm 2016-04-18 20:09:44 +01:00
parent cfdef68ad2 1f3e2ced4a
commit 961ad19660
3 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/compilers/rustc/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, callPackage }: { stdenv, callPackage }:
callPackage ./generic.nix { callPackage ./generic.nix {
shortVersion = "1.6.0"; shortVersion = "1.7.0";
isRelease = true; isRelease = true;
forceBundledLLVM = false; forceBundledLLVM = false;
configureFlags = [ "--release-channel=stable" ]; configureFlags = [ "--release-channel=stable" ];
srcSha = "1dvpiswl0apknizsz9bcrjnc4c43ys191a1b9gm3569xdlmxr36w"; srcSha = "05f4v6sfmvkwsv6a7jp9sxsm84s0gdvqyf2wwdi1ilg9k8nxzgd4";
/* Rust is bootstrapped from an earlier built version. We need /* Rust is bootstrapped from an earlier built version. We need
to fetch these earlier versions, which vary per platform. to fetch these earlier versions, which vary per platform.
@ -15,12 +15,12 @@ callPackage ./generic.nix {
for the tagged release and not a snapshot in the current HEAD. for the tagged release and not a snapshot in the current HEAD.
*/ */
snapshotHashLinux686 = "e2553bf399cd134a08ef3511a0a6ab0d7a667216"; snapshotHashLinux686 = "a09c4a4036151d0cb28e265101669731600e01f2";
snapshotHashLinux64 = "7df8ba9dec63ec77b857066109d4b6250f3d222f"; snapshotHashLinux64 = "97e2a5eb8904962df8596e95d6e5d9b574d73bf4";
snapshotHashDarwin686 = "29750870c82a0347f8b8b735a4e2e0da26f5098d"; snapshotHashDarwin686 = "ca52d2d3ba6497ed007705ee3401cf7efc136ca1";
snapshotHashDarwin64 = "c9f2c588238b4c6998190c3abeb33fd6164099a2"; snapshotHashDarwin64 = "3c44ffa18f89567c2b81f8d695e711c86d81ffc7";
snapshotDate = "2015-08-11"; snapshotDate = "2015-12-18";
snapshotRev = "1af31d4"; snapshotRev = "3391630";
patches = [ ./patches/remove-uneeded-git.patch ] patches = [ ./patches/remove-uneeded-git.patch ]
++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;

8
pkgs/development/compilers/rustc/generic.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps { stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps
, llvmPackages_37, jemalloc, ncurses, darwin, binutils , llvm, jemalloc, ncurses, darwin, binutils
, shortVersion, isRelease , shortVersion, isRelease
, forceBundledLLVM ? false , forceBundledLLVM ? false
@ -12,8 +12,6 @@
, patches , patches
} @ args: } @ args:
assert !stdenv.isFreeBSD;
/* Rust's build process has a few quirks : /* Rust's build process has a few quirks :
- The Rust compiler is written is Rust, so it requires a bootstrap - The Rust compiler is written is Rust, so it requires a bootstrap
@ -39,7 +37,7 @@ let version = if isRelease then
procps = if stdenv.isDarwin then darwin.ps else args.procps; procps = if stdenv.isDarwin then darwin.ps else args.procps;
llvmShared = llvmPackages_37.llvm.override { enableSharedLibraries = true; }; llvmShared = llvm.override { enableSharedLibraries = true; };
platform = if stdenv.system == "i686-linux" platform = if stdenv.system == "i686-linux"
then "linux-i386" then "linux-i386"
@ -66,7 +64,7 @@ let version = if isRelease then
description = "A safe, concurrent, practical language"; description = "A safe, concurrent, practical language";
maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ]; maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ];
license = [ licenses.mit licenses.asl20 ]; license = [ licenses.mit licenses.asl20 ];
platforms = platforms.linux; platforms = platforms.linux ++ platforms.darwin;
}; };
snapshotHash = if stdenv.system == "i686-linux" snapshotHash = if stdenv.system == "i686-linux"

8
pkgs/tools/misc/exa/default.nix
View file

@ -4,15 +4,15 @@ with rustPlatform;
buildRustPackage rec { buildRustPackage rec {
name = "exa-${version}"; name = "exa-${version}";
version = "2016-03-22"; version = "2016-04-11";
depsSha256 = "18anwh235kzziq6z7md8f3rl2xl4l9d4ivsqw9grkb7yivd5j0jk"; depsSha256 = "1rpynsni2r3gim10xc1qkj51wpbzafwsr99y61zh41v4vh047g1k";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ogham"; owner = "ogham";
repo = "exa"; repo = "exa";
rev = "8805ce9e3bcd4b56f8811a686dd56c47202cdbab"; rev = "9b87ef1da2231acef985bb08f7bd4a557167b652";
sha256 = "0dkvk0rsf068as6zcd01p7959rdjzm26mlkpid6z0j168gp4kh4q"; sha256 = "1f71bqkpc6bf9jg1zxy21rzbyhzghwfmgbyyyb81ggxcri0kajwi";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];