9e39329e1f
rust: 1.30.0 -> 1.30.1
52 lines
1.7 KiB
Nix
52 lines
1.7 KiB
Nix
{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl
|
|
, CoreFoundation, Security
|
|
, targets ? []
|
|
, targetToolchains ? []
|
|
, targetPatches ? []
|
|
}:
|
|
|
|
let
|
|
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
|
|
version = "1.30.1";
|
|
cargoVersion = "1.30.0";
|
|
src = fetchurl {
|
|
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
|
|
sha256 = "0aavdc1lqv0cjzbqwl5n59yd0bqdlhn0zas61ljf38yrvc18k8rn";
|
|
};
|
|
in rec {
|
|
rustc = callPackage ./rustc.nix {
|
|
inherit stdenv llvm targets targetPatches targetToolchains rustPlatform version src;
|
|
|
|
patches = [
|
|
./patches/net-tcp-disable-tests.patch
|
|
|
|
# Re-evaluate if this we need to disable this one
|
|
#./patches/stdsimd-disable-doctest.patch
|
|
|
|
# Fails on hydra - not locally; the exact reason is unknown.
|
|
# Comments in the test suggest that some non-reproducible environment
|
|
# variables such $RANDOM can make it fail.
|
|
./patches/disable-test-inherit-env.patch
|
|
];
|
|
|
|
withBundledLLVM = false;
|
|
|
|
configureFlags = [ "--release-channel=stable" ];
|
|
|
|
# 1. Upstream is not running tests on aarch64:
|
|
# see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567
|
|
# So we do the same.
|
|
# 2. Tests run out of memory for i686
|
|
#doCheck = !stdenv.isAarch64 && !stdenv.isi686;
|
|
|
|
# Disabled for now; see https://github.com/NixOS/nixpkgs/pull/42348#issuecomment-402115598.
|
|
doCheck = false;
|
|
};
|
|
|
|
cargo = callPackage ./cargo.nix rec {
|
|
version = cargoVersion;
|
|
inherit src stdenv CoreFoundation Security;
|
|
inherit rustc; # the rustc that will be wrapped by cargo
|
|
inherit rustPlatform; # used to build cargo
|
|
};
|
|
}
|