commit
b6e1b2f962
|
@ -3,16 +3,16 @@
|
||||||
let
|
let
|
||||||
# Note: the version MUST be one version prior to the version we're
|
# Note: the version MUST be one version prior to the version we're
|
||||||
# building
|
# building
|
||||||
version = "1.28.0";
|
version = "1.29.2";
|
||||||
|
|
||||||
# fetch hashes by running `print-hashes.sh 1.24.1`
|
# fetch hashes by running `print-hashes.sh 1.29.2`
|
||||||
hashes = {
|
hashes = {
|
||||||
i686-unknown-linux-gnu = "de7cdb4e665e897ea9b10bf6fd545f900683296456d6a11d8510397bb330455f";
|
i686-unknown-linux-gnu = "fd67338c32348fc0cf09dd066975acc221e062fdc3b052912baef93b39a0b27e";
|
||||||
x86_64-unknown-linux-gnu = "2a1390340db1d24a9498036884e6b2748e9b4b057fc5219694e298bdaa37b810";
|
x86_64-unknown-linux-gnu = "e9809825c546969a9609ff94b2793c9107d7d9bed67d557ed9969e673137e8d8";
|
||||||
armv7-unknown-linux-gnueabihf = "346558d14050853b87049e5e1fbfae0bf0360a2f7c57433c6985b1a879c349a2";
|
armv7-unknown-linux-gnueabihf = "943ee757d96be97baccb84b0c2a5da368f8f3adf082805b0f0323240e80975c0";
|
||||||
aarch64-unknown-linux-gnu = "9b6fbcee73070332c811c0ddff399fa31965bec62ef258656c0c90354f6231c1";
|
aarch64-unknown-linux-gnu = "e11461015ca7106ef8ebf00859842bf4be518ee170226cb8eedaaa666946509f";
|
||||||
i686-apple-darwin = "752e2c9182e057c4a54152d1e0b3949482c225d02bb69d9d9a4127dc2a65fb68";
|
i686-apple-darwin = "aadec39efcbc476e00722b527dcc587003ab05194efd06ba1b91c1e0f7512d3f";
|
||||||
x86_64-apple-darwin = "5d7a70ed4701fe9410041c1eea025c95cad97e5b3d8acc46426f9ac4f9f02393";
|
x86_64-apple-darwin = "63f54e3013406b39fcb5b84bcf5e8ce85860d0b97a1e156700e467bf5fb5d5f2";
|
||||||
};
|
};
|
||||||
|
|
||||||
platform =
|
platform =
|
||||||
|
|
|
@ -1,13 +1,10 @@
|
||||||
{ stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib
|
{ stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib
|
||||||
, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin
|
, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
|
||||||
|
, CoreFoundation, Security
|
||||||
, version
|
, version
|
||||||
, patches ? []
|
, patches ? []
|
||||||
, src }:
|
, src }:
|
||||||
|
|
||||||
let
|
|
||||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
|
|
||||||
in
|
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
name = "cargo-${version}";
|
name = "cargo-${version}";
|
||||||
inherit version src patches;
|
inherit version src patches;
|
||||||
|
@ -24,7 +21,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ]
|
buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ]
|
||||||
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ];
|
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
|
||||||
|
|
||||||
LIBGIT2_SYS_USE_PKG_CONFIG=1;
|
LIBGIT2_SYS_USE_PKG_CONFIG=1;
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl
|
{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl
|
||||||
|
, CoreFoundation, Security
|
||||||
, targets ? []
|
, targets ? []
|
||||||
, targetToolchains ? []
|
, targetToolchains ? []
|
||||||
, targetPatches ? []
|
, targetPatches ? []
|
||||||
|
@ -6,11 +7,11 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
|
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
|
||||||
version = "1.29.1";
|
version = "1.30.0";
|
||||||
cargoVersion = "1.29.1";
|
cargoVersion = "1.30.0";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
|
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
|
||||||
sha256 = "0jd3c57x3yndizns4pb68nh25si47agfmrdvf9nwwsyfcs5p5c7i";
|
sha256 = "1vh8q5i273xyjvpipqisny11iz0xfgz30cgjr7068nx5rhzsh2yd";
|
||||||
};
|
};
|
||||||
in rec {
|
in rec {
|
||||||
rustc = callPackage ./rustc.nix {
|
rustc = callPackage ./rustc.nix {
|
||||||
|
@ -44,8 +45,7 @@ in rec {
|
||||||
|
|
||||||
cargo = callPackage ./cargo.nix rec {
|
cargo = callPackage ./cargo.nix rec {
|
||||||
version = cargoVersion;
|
version = cargoVersion;
|
||||||
inherit src;
|
inherit src stdenv CoreFoundation Security;
|
||||||
inherit stdenv;
|
|
||||||
inherit rustc; # the rustc that will be wrapped by cargo
|
inherit rustc; # the rustc that will be wrapped by cargo
|
||||||
inherit rustPlatform; # used to build cargo
|
inherit rustPlatform; # used to build cargo
|
||||||
};
|
};
|
||||||
|
|
|
@ -92,15 +92,15 @@ stdenv.mkDerivation {
|
||||||
#[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
|
#[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
|
||||||
|
|
||||||
# Disable fragile tests.
|
# Disable fragile tests.
|
||||||
rm -vr src/test/run-make/linker-output-non-utf8 || true
|
rm -vr src/test/run-make-fulldeps/linker-output-non-utf8 || true
|
||||||
rm -vr src/test/run-make/issue-26092 || true
|
rm -vr src/test/run-make-fulldeps/issue-26092 || true
|
||||||
|
|
||||||
# Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835
|
# Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835
|
||||||
rm -vr src/test/run-pass/issue-36023.rs || true
|
rm -vr src/test/ui/run-pass/issue-36023.rs || true
|
||||||
|
|
||||||
# Disable test getting stuck on hydra - possible fix:
|
# Disable test getting stuck on hydra - possible fix:
|
||||||
# https://reviews.llvm.org/rL281650
|
# https://reviews.llvm.org/rL281650
|
||||||
rm -vr src/test/run-pass/issue-36474.rs || true
|
rm -vr src/test/ui/run-pass/issue-36474.rs || true
|
||||||
|
|
||||||
# On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)'
|
# On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)'
|
||||||
sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs
|
sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs
|
||||||
|
@ -116,18 +116,18 @@ stdenv.mkDerivation {
|
||||||
# Disable all lldb tests.
|
# Disable all lldb tests.
|
||||||
# error: Can't run LLDB test because LLDB's python path is not set
|
# error: Can't run LLDB test because LLDB's python path is not set
|
||||||
rm -vr src/test/debuginfo/*
|
rm -vr src/test/debuginfo/*
|
||||||
rm -v src/test/run-pass/backtrace-debuginfo.rs
|
rm -v src/test/run-pass/backtrace-debuginfo.rs || true
|
||||||
|
|
||||||
# error: No such file or directory
|
# error: No such file or directory
|
||||||
rm -v src/test/run-pass/issue-45731.rs
|
rm -v src/test/ui/run-pass/issues/issue-45731.rs || true
|
||||||
|
|
||||||
# Disable tests that fail when sandboxing is enabled.
|
# Disable tests that fail when sandboxing is enabled.
|
||||||
substituteInPlace src/libstd/sys/unix/ext/net.rs \
|
substituteInPlace src/libstd/sys/unix/ext/net.rs \
|
||||||
--replace '#[test]' '#[test] #[ignore]'
|
--replace '#[test]' '#[test] #[ignore]'
|
||||||
substituteInPlace src/test/run-pass/env-home-dir.rs \
|
substituteInPlace src/test/run-pass/env-home-dir.rs \
|
||||||
--replace 'home_dir().is_some()' true
|
--replace 'home_dir().is_some()' true
|
||||||
rm -v src/test/run-pass/fds-are-cloexec.rs # FIXME: pipes?
|
rm -v src/test/run-pass/fds-are-cloexec.rs || true # FIXME: pipes?
|
||||||
rm -v src/test/run-pass/sync-send-in-std.rs # FIXME: ???
|
rm -v src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs || true # FIXME: ???
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# rustc unfortunately need cmake for compiling llvm-rt but doesn't
|
# rustc unfortunately need cmake for compiling llvm-rt but doesn't
|
||||||
|
|
|
@ -7327,8 +7327,9 @@ with pkgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
# For beta and nightly releases use the nixpkgs-mozilla overlay
|
# For beta and nightly releases use the nixpkgs-mozilla overlay
|
||||||
rust = callPackage ../development/compilers/rust
|
rust = callPackage ../development/compilers/rust ({
|
||||||
(stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
|
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||||
|
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
|
||||||
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
|
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
|
||||||
});
|
});
|
||||||
inherit (rust) cargo rustc;
|
inherit (rust) cargo rustc;
|
||||||
|
|
Loading…
Reference in a new issue