public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustc: 1.24.0 -> 1.24.1 and glibc-2.27 patch.

Browse Source
This commit is contained in:
Shea Levy 2018-03-07 20:52:09 -05:00
parent 34898469f7
commit 3a143dcad2
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/rust/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl { stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl
, fetchpatch
, 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.24.0"; version = "1.24.1";
cargoVersion = "0.24.0"; cargoVersion = "0.24.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 = "17v3jpyky8vkkgai5yd2zr8zl87qpgj6dx99gx27x1sf0kv7d0mv"; sha256 = "1vv10x2h9kq7fxh2v01damdq8pvlp5acyh1kzcda9sfjx12kv99y";
}; };
in rec { in rec {
rustc = callPackage ./rustc.nix { rustc = callPackage ./rustc.nix {
@ -22,6 +23,11 @@ in rec {
patches = [ patches = [
./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch
# Adapted from https://github.com/rust-lang/rust/pull/47912
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/rust/raw/1bb4d24c060915c304c9a9f86a438388e599f9c6/f/0002-Use-a-range-to-identify-SIGSEGV-in-stack-guards.patch";
sha256 = "16hc170qzzcb9lcabk0ln005zji2h1gq0knbr9avbbzlbg9jha2q";
})
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch
# https://github.com/rust-lang/rust/issues/45410 # https://github.com/rust-lang/rust/issues/45410
++ stdenv.lib.optional stdenv.isAarch64 ./patches/aarch64-disable-test_loading_cosine.patch; ++ stdenv.lib.optional stdenv.isAarch64 ./patches/aarch64-disable-test_loading_cosine.patch;