pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #38696 from pbogdan/rust-drop-patch

rust: drop obsolete patch (now included in upstream sources)

authored by Jan Tojnar and committed by GitHub 3de85fbe 2483a0d0

-6
unified split
-6
pkgs/development/compilers/rust/default.nix
··· 1 { stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl 2 - , fetchpatch 3 , targets ? [] 4 , targetToolchains ? [] 5 , targetPatches ? [] ··· 23 24 patches = [ 25 ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch 26 - # Adapted from https://github.com/rust-lang/rust/pull/47912 27 - (fetchpatch { 28 - url = "https://src.fedoraproject.org/rpms/rust/raw/1bb4d24c060915c304c9a9f86a438388e599f9c6/f/0002-Use-a-range-to-identify-SIGSEGV-in-stack-guards.patch"; 29 - sha256 = "16hc170qzzcb9lcabk0ln005zji2h1gq0knbr9avbbzlbg9jha2q"; 30 - }) 31 ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch 32 # https://github.com/rust-lang/rust/issues/45410 33 ++ stdenv.lib.optional stdenv.isAarch64 ./patches/aarch64-disable-test_loading_cosine.patch;
··· 1 { stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl 2 , targets ? [] 3 , targetToolchains ? [] 4 , targetPatches ? [] ··· 22 23 patches = [ 24 ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch 25 ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch 26 # https://github.com/rust-lang/rust/issues/45410 27 ++ stdenv.lib.optional stdenv.isAarch64 ./patches/aarch64-disable-test_loading_cosine.patch;