2016-06-14 11:49:48 +01:00
|
|
|
{ stdenv, callPackage, rustPlatform,
|
|
|
|
targets ? [], targetToolchains ? [], targetPatches ? [] }:
|
|
|
|
|
|
|
|
rec {
|
|
|
|
rustc = callPackage ./rustc.nix {
|
2016-07-19 09:25:35 +01:00
|
|
|
shortVersion = "beta-1.11.0";
|
2016-06-14 11:49:48 +01:00
|
|
|
forceBundledLLVM = false;
|
2016-07-19 09:25:35 +01:00
|
|
|
needsCmake = true;
|
2016-06-14 11:49:48 +01:00
|
|
|
configureFlags = [ "--release-channel=beta" ];
|
2016-07-19 09:25:35 +01:00
|
|
|
srcRev = "9333c420da0da6291740c313d5af3d620b55b8bc";
|
|
|
|
srcSha = "05z6i4s5jjw3c5ypap6kzxk81bg4dib47h51znvsvcvr0svsnkgs";
|
|
|
|
patches = [
|
|
|
|
./patches/disable-lockfile-check.patch
|
|
|
|
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
|
2016-06-14 11:49:48 +01:00
|
|
|
inherit targets;
|
|
|
|
inherit targetPatches;
|
|
|
|
inherit targetToolchains;
|
|
|
|
inherit rustPlatform;
|
|
|
|
};
|
|
|
|
|
|
|
|
cargo = callPackage ./cargo.nix rec {
|
2016-08-08 21:20:56 +01:00
|
|
|
# TODO: We're temporarily tracking master here as Darwin needs the
|
|
|
|
# `http.cainfo` option from .cargo/config which isn't released
|
|
|
|
# yet.
|
|
|
|
|
|
|
|
version = "beta-2016-07-25";
|
|
|
|
srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0";
|
|
|
|
srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155";
|
|
|
|
depsSha256 = "055ky0lkrcsi976kmvc4lqyv0sjdpcj3jv36kz9hkqq0gip3crjc";
|
|
|
|
|
2016-06-14 11:49:48 +01:00
|
|
|
inherit rustc; # the rustc that will be wrapped by cargo
|
|
|
|
inherit rustPlatform; # used to build cargo
|
|
|
|
};
|
|
|
|
}
|