Commit Graph

9719 Commits

Author SHA1 Message Date
Michael Weiss
478fecce96 llvmPackages_13.compiler-rt: Mark as broken on Aarch64
To avoid unnecessary builds but this needs to be fixed ASAP. Chromium
already depends on it and a lot of additional packages, including Mesa,
will depend on it after the stable release.

(cherry picked from commit 5661f7dbeeee708a401d2524ddb40374dda4c6a7)
2021-09-03 22:30:22 +00:00
Michael Weiss
56ebee647a llvmPackages_13: 13.0.0-rc1 -> 13.0.0-rc2
Upstream backported 5060224d9eed8b8359ed5090bb7c577b8575e9e7:
93da37dc58

(cherry picked from commit bac15390f5dbe8072b7acc77329e68a9fdfb5758)
2021-09-03 11:40:30 +02:00
Yureka
90cb748196 llvmPackages_13.libcxx: mark as broken on darwin
(cherry picked from commit f8230bb0f482e639b09d84c2ffaf2ca95c179427)
2021-09-03 11:40:29 +02:00
Yureka
373402fb6d llvm_13: fix tests on non-x86 platforms
(cherry picked from commit 48d1e393c03cfbb9c00979a28f99f9a8bd2dac94)
2021-09-03 11:40:28 +02:00
Yureka
036e4b3df8 llvm_13: workaround for llvm bug 50611
https://bugs.llvm.org/show_bug.cgi?id=50611
(cherry picked from commit 91b15b6dcfd2d394e707fdfaa10d563bbf2f8198)
2021-09-03 11:40:27 +02:00
Michael Weiss
bcfaa8041c pkgsi686Linux.llvmPackages_13.compiler-rt: fix build
Ported from a7c4537a729929f6670349f67d248ffb6ff800da.

(cherry picked from commit c8db49f0a939ce2219b41f8d3993268ceeef05f1)
2021-09-03 11:40:26 +02:00
Michael Weiss
81aa38b83d llvmPackages_13.lldb: python into lib & wrap binary
Ported from cc7740ae770c52ac1f385aa25cfc143fe79c6b6e.

(cherry picked from commit a5f0733461e6937d0397e2afdef73db15f748c61)
2021-09-03 11:40:25 +02:00
Michael Weiss
11d06468b3 llvmPackages_13.lldb: fix python lldb library
Ported from e097f7efc77726a17acca7be3e6e2346331883f3.

(cherry picked from commit a6defaf953d4470a9dcf8cae3bef1c2c4d17f296)
2021-09-03 11:40:25 +02:00
Michael Weiss
80f644e0d2 llvmPackages_13.compiler-rt: fix build on darwin
Ported from cf4e1b9e62ab987552eb676f7618ea085f12a751.

(cherry picked from commit 6a1354b1fc14dfd549bd88f58aede0178f489415)
2021-09-03 11:40:24 +02:00
Michael Weiss
cb51b0e984 llvmPackages_13.clang: fix linker invocation with LLVMgold plugin
Ported from 3530837417da13076a2c8412de2c0c385dfbd648.

(cherry picked from commit c858c42002313cc5f9c837c10d8b3babddc77b32)
2021-09-03 11:40:23 +02:00
Michael Weiss
90c3f09977 llvmPackages_13: init at 13.0.0-rc1
(cherry picked from commit 2540b66ba652d68d9f1ba487d516c22f8ae69bec)
2021-09-03 11:40:19 +02:00
Michael Weiss
ebd2a830dc llvmPackages_13: Copy from llvmPackages_git
(cherry picked from commit f3f86d47220e2c2332d60f6bd0a89b76a628529d)
2021-09-03 11:39:05 +02:00
misuzu
49f3fda496 llvm_11: disable failing 'dependent-libraries.test' on armv7l
(cherry picked from commit 23ab12364036aebff032bdb4343312ebea0dbcaf)
2021-08-16 10:39:28 +00:00
Vladimír Čunát
b43522a1f5 Merge #132834: go security bumps (into release-21.05) 2021-08-10 14:04:13 +02:00
Artturi
a8deceff73 Merge pull request #126582 from NixOS/backport-123513-to-release-21.05
[Backport release-21.05] oraclejdk*: use latest ffmpeg
2021-08-07 00:16:44 +03:00
zowoq
944fd2b224 go_1_16: 1.16.6 -> 1.16.7
(cherry picked from commit 869e4a894e7436441bdcb084846c60ae07a1dddd)
2021-08-05 23:12:50 +00:00
zowoq
9b73e93818 go_1_15: 1.15.14 -> 1.15.15
(cherry picked from commit 1d3f4cd77fd7ce68cc80f2dd33bd678a5633af93)
2021-08-05 23:12:50 +00:00
Vladimír Čunát
2e65ac6695 Merge #130529: llvmPackages_12: 12.0.0 -> 12.0.1
...into staging-21.05
2021-07-23 14:28:19 +02:00
Benjamin Asbach
cd0a0d23e3 openjdk: 11.0.11+9 -> 11.0.12+7 2021-07-21 19:48:18 -06:00
Benjamin Asbach
e1a569f341 openjdk: 11.0.10+11 -> 11.0.11+9
fixes #128407
2021-07-21 19:48:14 -06:00
Michael Weiss
111e281dd8 llvmPackages_12: 12.0.0 -> 12.0.1
(cherry picked from commit 9a761a4fc8f0b07c6162e334b34c69ddd9c754e8)
2021-07-18 09:12:34 +00:00
Maxine Aubrey
3034d322a9 go_1_16: 1.16.5 -> 1.16.6
(cherry picked from commit 4695639fdef6095c3b4358d55f5947235159d7e8)
2021-07-14 17:43:50 +02:00
Maxine Aubrey
11beeade2d go_1_15: 1.15.13 -> 1.15.14
(cherry picked from commit 25eb6344d03d644084d9d3cb3c571f5664accf93)
2021-07-14 17:43:44 +02:00
zowoq
8f3ec9ee43 go: cleanup
(cherry picked from commit 88f1ca731cd772843c05a3395ae4eb283b1ef98d)
2021-07-14 17:43:37 +02:00
zowoq
46fc5b82ea go: format with nixpkgs-fmt
(cherry picked from commit 3a365e0e506068ff30a261b486942a199312dc76)
2021-07-14 17:43:31 +02:00
zowoq
43a526d41d go: add runHooks to bootstrap binary
(cherry picked from commit 99697d891de658a5b6ea4bd4ea5ef9acfb62ea13)
2021-07-14 17:43:22 +02:00
github-actions[bot]
f69d5bc5d0 Merge release-21.05 into staging-next-21.05 2021-07-03 12:02:32 +00:00
Jörg Thalheim
fa55b0121e Merge pull request #128445 from maxeaubrey/21.05_go_1.16
[21.05] go_1_16: 1.16.4 -> 1.16.5
2021-07-03 07:06:11 +01:00
Jonathan Ringer
bb60ebee93 Merge remote-tracking branch 'origin/release-21.05' into staging-next-21.05 2021-06-28 10:04:12 -07:00
zowoq
d08b831a2c go_1_16: 1.16.4 -> 1.16.5
(cherry picked from commit b3a05d2ccb78b2c64d65f38b3516bfa84348a1b4)
2021-06-27 19:19:48 +02:00
zowoq
b718514bcd go_1_15: 1.15.12 -> 1.15.13
(cherry picked from commit d038f9545034f237e83f1678ffd34e7b12adf955)
2021-06-27 19:19:24 +02:00
Jonathan Ringer
5299f12e63 Merge branch 'staging-next-21.05' into staging-21.05 2021-06-25 00:15:49 -07:00
sternenseemann
9a84eb7ec8 haskell.compiler.*: pull in unwrapped bintools for darwin
GHC calls otool on darwin which is contained in the
stdenv.cc.bintools.bintools derivation and thus needs adding to the
runtime PATH of GHC. Since this is toolchain specific technically, we
check for cctools instead of darwin (although I don't know if GHC
or nixpkgs work on macOS without cctools).

This fixes usage of GHC in an environment where otool is not available
and more specifically in stdenvNoCC which is used by writers.writeHaskell.
Resolves #123228.

(cherry picked from commit 118b28a127c79dbae8c513742fbb17f300407a4b)
2021-06-14 12:21:22 +02:00
Dmitry Kalinkin
af3e82ab87 llvmPackages_12.compiler-rt: fix build on darwin
```
/tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:617:7: error: use of undeclared
      identifier 'TARGET_OS_IOS'
  if (TARGET_OS_IOS || TARGET_OS_TV) return 6;
      ^
/tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:617:24: error: use of undeclared
      identifier 'TARGET_OS_TV'
  if (TARGET_OS_IOS || TARGET_OS_TV) return 6;
                       ^
/tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:618:7: error: use of undeclared
      identifier 'TARGET_OS_WATCH'
  if (TARGET_OS_WATCH) return 13;
      ^
/tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:687:7: error: use of undeclared
      identifier 'TARGET_OS_IOS'
  if (TARGET_OS_IOS || TARGET_OS_TV)
      ^
/tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:687:24: error: use of undeclared
      identifier 'TARGET_OS_TV'
  if (TARGET_OS_IOS || TARGET_OS_TV)
                       ^
/tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:689:12: error: use of undeclared
      identifier 'TARGET_OS_WATCH'
  else if (TARGET_OS_WATCH)
           ^
6 errors generated.
```

(cherry picked from commit cf4e1b9e62ab987552eb676f7618ea085f12a751)
2021-06-11 16:45:59 +00:00
Louis Bettens
de24120898 oraclejdk*: use latest ffmpeg
(cherry picked from commit 50cb5bc35cd6d158672e0bc37cf0157790035168)
2021-06-11 10:10:58 +00:00
Jonathan Ringer
7b601ada77 Merge remote-tracking branch 'origin/release-21.05' into staging-next-21.05 2021-05-31 12:44:56 -07:00
Christian Kögler
cd8efe13e0 halide: Fix build
(cherry picked from commit ba677b14dd937dc00723dc13dfa2f53c934db392)
2021-05-30 18:13:07 +00:00
Luka Blaskovic
76e136bb5e rustc: 1_52, use correct llvm version 2021-05-24 23:47:14 -07:00
sternenseemann
3a165fda92 llvmPackages*.clang: fix linker invocation with LLVMgold plugin
When using GNU binutils, clang passes the LLVMgold.so plugin to the
linker for certain operations that require special support in the linker
like doing link time optimization (LTO). When passing the plugin to the
linker's command line, clang assumes that llvm and itself are installed
in the same prefix and thus `/path/to/clang/bin/../lib/LLVMgold.so` is
the plugin.

Since we install clang and llvm to separate store paths, this assumption
does not hold. When clang-unwrapped only had a single output, we worked
around this issue by symlinking `$out/lib/LLVMgold.so` to
`${llvm}/lib/LLVMgold.so`. However since we split all llvm packages into
multiple outputs clang's `$out` no longer has a lib directory and clang
can't discover clangs lib output on its own. As a result LTO was broken.

Instead of introducing yet another hack and having a symlink to
LLVMgold.so in `$out/lib` (despite having `$lib/lib` as well), we patch
clang to use a hard coded path to `${libllvm.lib}/lib` for discovering
`LLVMgold.so`.

Resolves #123361.

(cherry picked from commit 3530837417da13076a2c8412de2c0c385dfbd648)
2021-05-23 14:48:58 +02:00
Jonathan Ringer
14f3686af1 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/terminal-emulators/alacritty/default.nix
  pkgs/servers/clickhouse/default.nix
2021-05-20 09:12:42 -07:00
Robert Schütz
d2f2e638a9 openjfx11: use ffmpeg instead of ffmpeg_3 (#123500) 2021-05-19 23:35:43 +02:00
Jonathan Ringer
274a71f262 solc: make darwin friendly 2021-05-19 14:08:09 -07:00
Andrew Childs
2987d66d0f llvmPackages_11.compiler-rt: fix build on x86_64-darwin
Amendment to changes in 56fcbcd154.

Co-authored-by: John Ericson <John.Ericson@Obsidian.Systems>
2021-05-19 12:33:53 -07:00
Jonathan Ringer
c1f8a15dac Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  nixos/doc/manual/release-notes/rl-2105.xml
  pkgs/tools/security/sequoia/default.nix
2021-05-19 10:39:54 -07:00
Dennis Gosnell
b76684aff7 Merge pull request #122719 from NixOS/haskell-updates
haskell: update package set
2021-05-19 10:52:35 +09:00
(cdep)illabout
721c8ab307 haskell.compiler.ghcHEAD: disable Hydra build on aarch64-linux 2021-05-19 10:30:23 +09:00
github-actions[bot]
7000ae2b9a Merge master into staging-next 2021-05-19 00:55:36 +00:00
Stéphan Kochen
e726f8034f cc65: fix darwin build 2021-05-18 18:56:00 +02:00
Jonathan Ringer
f7a112f6c4 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
Pontus Stenetorp
61b8bf948e julia: mark julia_10-bin as insecure 2021-05-18 07:37:24 +00:00