diff options
| author | Piotr Bogdan <ppbogdan@gmail.com> | 2018-04-10 17:58:27 +0100 |
|---|---|---|
| committer | Piotr Bogdan <ppbogdan@gmail.com> | 2018-04-11 14:11:16 +0100 |
| commit | f09a0a8e43d7407aa871c5b8a7c2a403a0526053 (patch) | |
| tree | 0b61502e5b05bee5dc124989b8811103a16beb5a | |
| parent | 136403655c15b830fff4f58fd90b3e1478c7ba30 (diff) | |
| download | nixlib-f09a0a8e43d7407aa871c5b8a7c2a403a0526053.tar nixlib-f09a0a8e43d7407aa871c5b8a7c2a403a0526053.tar.gz nixlib-f09a0a8e43d7407aa871c5b8a7c2a403a0526053.tar.bz2 nixlib-f09a0a8e43d7407aa871c5b8a7c2a403a0526053.tar.lz nixlib-f09a0a8e43d7407aa871c5b8a7c2a403a0526053.tar.xz nixlib-f09a0a8e43d7407aa871c5b8a7c2a403a0526053.tar.zst nixlib-f09a0a8e43d7407aa871c5b8a7c2a403a0526053.zip | |
rust: drop obsolete patch (now included in upstream sources)
| -rw-r--r-- | pkgs/development/compilers/rust/default.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 3f189249ccad..d9a36273ce1d 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -1,5 +1,4 @@ { stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl -, fetchpatch , targets ? [] , targetToolchains ? [] , targetPatches ? [] @@ -23,11 +22,6 @@ in rec { patches = [ ./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 # https://github.com/rust-lang/rust/issues/45410 ++ stdenv.lib.optional stdenv.isAarch64 ./patches/aarch64-disable-test_loading_cosine.patch; |