BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rustc: 1.34.2 -> 1.35.0

Browse source
This commit is contained in:
Eelco Dolstra 2019-06-13 21:20:37 +02:00 committed by Frederik Rietdijk
parent a1f852e782
commit 513bd49b44
3 changed files with 36 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/compilers/rust/bootstrap.nix
View file

@ -3,16 +3,16 @@
let
# Note: the version MUST be one version prior to the version we're
# building
version = "1.33.0";
version = "1.34.2";
# fetch hashes by running `print-hashes.sh 1.33.0`
# fetch hashes by running `print-hashes.sh 1.34.2`
hashes = {
i686-unknown-linux-gnu = "c379203687d98e60623aa88c4df4992dd5a9548bc30674b9fc8e671a979e9f3a";
x86_64-unknown-linux-gnu = "6623168b9ee9de79deb0d9274c577d741ea92003768660aca184e04fe774393f";
armv7-unknown-linux-gnueabihf = "f6f0ec0a98d922c4bfd79703bc9e9eef439ba347453f33608a87cd63c47e7245";
aarch64-unknown-linux-gnu = "a308044e4076b62f637313ea803fa0a8f340b0f1b53136856f2c43afcabe5387";
i686-apple-darwin = "ed20809d56bbaea041721ce6fc9f10f7ae7a720c5821587f01a537d07a5454b1";
x86_64-apple-darwin = "864e7c074a0b88e38883c87c169513d072300bb52e1d320a067bd34cf14f66bd";
i686-unknown-linux-gnu = "926bafd09eb90ba7d5a0195fcffb8f33dd57e515af4f8987a143459f6b1d3f04";
x86_64-unknown-linux-gnu = "2bf6622d980a52832bae141304e96f317c8a1ccd2dfd69a134a14033e6e43c0f";
armv7-unknown-linux-gnueabihf = "70d1057fcc133dc3e44377060a00d2f9d3a134e2670963d3f1d93f3dbfa0548e";
aarch64-unknown-linux-gnu = "15fc6b7ec121df9d4e42483dd12c677203680bec8c69b6f4f62e5a35a07341a8";
i686-apple-darwin = "b9fc44cbb06050975664f1033d1337bb38d5ea73b503a5d3af5409033397be5c";
x86_64-apple-darwin = "6fdd4bf7fe26dded0cd57b41ab5f0500a5a99b7bc770523a425e9e34f63d0fd8";
};
platform =

53
pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
View file

@ -1,8 +1,7 @@
diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
index 86ecb10edf..626be0a52d 100644
--- a/src/libstd/net/tcp.rs
+++ b/src/libstd/net/tcp.rs
@@ -955,6 +955,7 @@ mod tests {
diff -ru -x '*~' rustc-1.35.0-src-orig/src/libstd/net/tcp.rs rustc-1.35.0-src/src/libstd/net/tcp.rs
--- rustc-1.35.0-src-orig/src/libstd/net/tcp.rs 2019-05-20 14:10:15.000000000 +0200
+++ rustc-1.35.0-src/src/libstd/net/tcp.rs 2019-06-13 19:59:46.740611889 +0200
@@ -973,6 +973,7 @@
}
}
@ -10,7 +9,7 @@ index 86ecb10edf..626be0a52d 100644
#[test]
fn listen_localhost() {
let socket_addr = next_test_ip4();
@@ -1013,6 +1014,7 @@ mod tests {
@@ -1031,6 +1032,7 @@
})
}
@ -18,7 +17,7 @@ index 86ecb10edf..626be0a52d 100644
#[test]
fn read_eof() {
each_ip(&mut |addr| {
@@ -1032,6 +1034,7 @@ mod tests {
@@ -1050,6 +1052,7 @@
})
}
@ -26,7 +25,7 @@ index 86ecb10edf..626be0a52d 100644
#[test]
fn write_close() {
each_ip(&mut |addr| {
@@ -1058,6 +1061,7 @@ mod tests {
@@ -1076,6 +1079,7 @@
})
}
@ -34,7 +33,7 @@ index 86ecb10edf..626be0a52d 100644
#[test]
fn multiple_connect_serial() {
each_ip(&mut |addr| {
@@ -1080,6 +1084,7 @@ mod tests {
@@ -1098,6 +1102,7 @@
})
}
@ -42,7 +41,7 @@ index 86ecb10edf..626be0a52d 100644
#[test]
fn multiple_connect_interleaved_greedy_schedule() {
const MAX: usize = 10;
@@ -1116,6 +1121,7 @@ mod tests {
@@ -1134,6 +1139,7 @@
}
#[test]
@ -50,7 +49,7 @@ index 86ecb10edf..626be0a52d 100644
fn multiple_connect_interleaved_lazy_schedule() {
const MAX: usize = 10;
each_ip(&mut |addr| {
@@ -1394,6 +1400,7 @@ mod tests {
@@ -1467,6 +1473,7 @@
}
#[test]
@ -58,7 +57,7 @@ index 86ecb10edf..626be0a52d 100644
fn clone_while_reading() {
each_ip(&mut |addr| {
let accept = t!(TcpListener::bind(&addr));
@@ -1504,7 +1511,10 @@ mod tests {
@@ -1597,7 +1604,10 @@
// FIXME: re-enabled bitrig/openbsd tests once their socket timeout code
// no longer has rounding errors.
@ -67,30 +66,30 @@ index 86ecb10edf..626be0a52d 100644
+ target_os = "netbsd",
+ target_os = "openbsd",
+ target_os = "macos"), ignore)]
#[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31
#[test]
fn timeouts() {
let addr = next_test_ip4();
@@ -1591,6 +1601,7 @@ mod tests {
@@ -1643,6 +1653,7 @@
drop(listener);
}
+ #[cfg_attr(target_os = "macos", ignore)]
#[test]
#[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31
fn test_read_with_timeout() {
@@ -1687,6 +1698,7 @@
drop(listener);
}
+ #[cfg_attr(target_os = "macos", ignore)]
#[test]
#[cfg_attr(target_env = "sgx", ignore)]
fn nodelay() {
let addr = next_test_ip4();
@@ -1605,6 +1616,7 @@ mod tests {
assert_eq!(false, t!(stream.nodelay()));
@@ -1719,6 +1731,7 @@
assert_eq!(ttl, t!(stream.ttl()));
}
+ #[cfg_attr(target_os = "macos", ignore)]
#[test]
fn ttl() {
let ttl = 100;
@@ -1642,6 +1654,7 @@ mod tests {
}
}
+ #[cfg_attr(target_os = "macos", ignore)]
#[test]
fn peek() {
each_ip(&mut |addr| {
#[cfg_attr(target_env = "sgx", ignore)]
fn set_nonblocking() {

4
pkgs/development/compilers/rust/rustc.nix
View file

@ -17,11 +17,11 @@ let
llvmShared = llvm_7.override { enableSharedLibraries = true; };
in stdenv.mkDerivation rec {
pname = "rustc";
version = "1.34.2";
version = "1.35.0";
src = fetchurl {
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
sha256 = "0mig0prkmlnpbba1cmi17vlsl88ikv5pi26zjy2kcr64l62lm6n6";
sha256 = "0bbizy6b7002v1rdhrxrf5gijclbyizdhkglhp81ib3bf5x66kas";
};
__darwinAllowLocalNetworking = true;