diff options
| author | Will Dietz <github@wdtz.org> | 2019-01-31 13:44:40 -0600 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 18:18:05 +0100 |
| commit | 75df522844578a6523e876f35f2fee0167960be9 (patch) | |
| tree | 8c6c36a57d17322cca40f9c1e69ddd7c8062eb26 /pkgs/development/compilers/llvm | |
| parent | 5effa4e0f98b317fe4607b1a6548811017c3325d (diff) | |
| download | nixpkgs-75df522844578a6523e876f35f2fee0167960be9.tar nixpkgs-75df522844578a6523e876f35f2fee0167960be9.tar.gz nixpkgs-75df522844578a6523e876f35f2fee0167960be9.tar.bz2 nixpkgs-75df522844578a6523e876f35f2fee0167960be9.tar.lz nixpkgs-75df522844578a6523e876f35f2fee0167960be9.tar.xz nixpkgs-75df522844578a6523e876f35f2fee0167960be9.tar.zst nixpkgs-75df522844578a6523e876f35f2fee0167960be9.zip | |
Merge #54998: llvm7: replace patch with official upstream commit
(cherry picked from commit 442a74bdf896db0ddcb750c57e9d58eb17d06769)
Diffstat (limited to 'pkgs/development/compilers/llvm')
| -rw-r--r-- | pkgs/development/compilers/llvm/7/llvm.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index 0eb946a0a83..5800e7f021c 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -49,9 +49,10 @@ in stdenv.mkDerivation (rec { patches = [ # https://bugs.llvm.org/show_bug.cgi?id=39427 + # https://github.com/NixOS/nixpkgs/issues/54370 (fetchpatch { - url = "https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/raw/5a7d283d4e00bc4822c7b0226e593c344c8f6050/debian/patches/pr39427-misscompile.diff"; - sha256 = "03mpydsaw0xvcp7kb4sgjzcl5v22620r5z78kv3mz5wp7sn76fg5"; + url = "https://github.com/llvm-mirror/llvm/commit/57567def148f387153a8149fb590bd39b1b006a1.patch"; + sha256 = "1w1xg5pxpc6cals1nf5j5k4p6qi8lcrpvn0paxc86m415i79xmcg"; }) ]; |