Commit Graph

9837 Commits

Author SHA1 Message Date
Michael Weiss
a7f062d898
llvmPackages_git: Build from Git
The version will initially remain the same so that no additional changes
to the packaging are required (i.e. this commit only includes the
required changes to build from the mono repository instead of individual
tarballs).
2021-06-03 20:33:35 +02:00
Michael Weiss
e458a01401
llvmPackages_git: Copy from llvmPackages_12
The purpose of this package is to continuously improve the LLVM
packaging in Nixpkgs without causing a lot of rebuilds and provide more
recent LLVM builds for users. For more details see:
https://github.com/NixOS/nixpkgs/issues/114828
2021-06-03 20:14:05 +02:00
Sandro
6a9a6b95c8
Merge pull request #113402 from siraben/zasm-xcompile 2021-06-03 16:58:18 +02:00
Sandro
aed59366ff
Merge pull request #125378 from nagy/purescript-mainprogram
purescript: add meta.mainProgram
2021-06-03 16:38:12 +02:00
github-actions[bot]
a12e0d5bff
Merge master into staging-next 2021-06-03 12:49:11 +00:00
Atemu
f6594d72ad jetbrains-jdk: set mainProgram 2021-06-03 14:40:19 +02:00
Atemu
e11cc89835 jetbrains-jdk: inherit license and platforms from openjdk 2021-06-03 14:40:16 +02:00
Domen Kožar
aeb44a891a
Merge pull request #125184 from domenkozar/aarch64-darwin-eval
Aarch64 darwin eval
2021-06-03 11:21:20 +02:00
Domen Kožar
9e6417f2a4
fix tarball job evaluation for aarch64-darwin 2021-06-03 10:52:46 +02:00
Dmitry Kalinkin
cf4e1b9e62
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.
```
2021-06-03 03:08:10 -04:00
github-actions[bot]
825cffa5ae
Merge master into staging-next 2021-06-02 20:25:05 +00:00
sternenseemann
e308370fc8 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-06-02 17:07:43 +02:00
Daniel Nagy
9c14e1f92a
purescript: add meta.mainProgram 2021-06-02 15:53:11 +02:00
github-actions[bot]
1176851146
Merge master into staging-next 2021-06-02 07:51:53 +00:00
Farid Zakaria
fa44962db9 jdk8: fix sprintf patch
This fixes a recent commit via #123708
The patch itself had an additional '%s' in the sprintf which is unsafe
depending on the surrounding memory.
2021-06-01 20:14:20 -07:00
github-actions[bot]
42b70ad7f1
Merge master into staging-next 2021-06-01 20:30:45 +00:00
Sandro
bf8430634a
Merge pull request #123708 from fzakaria/faridzakaria/nix-jdk8-library-path
jdk8: Remove default java.library.path
2021-06-01 20:25:28 +02:00
Guillaume Bouchard
81c8d158a8 ghc: add missing meta data
`haskellCompilerName` in cabal2nix and hence ghc 8.10.2 and 8.6.5
"-binary" were not working correctly in this context.
2021-06-01 12:46:55 +02:00
Andrew Childs
ccb99f68e5
(darwin) openjdk: 16.0.0 -> 16.0.1
Also adds aarch64-darwin support

(cherry picked from commit 4288adb8f6)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-06-01 09:58:47 +02:00
Andrew Childs
a5b2f798eb
(darwin) openjdk11: 11.0.9 -> 11.0.11
Also adds aarch64-darwin support

(cherry picked from commit 1b006e331c)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-06-01 09:58:26 +02:00
Andrew Childs
1629efe286
(darwin) openjdk8: 8.0.202 -> 8.0.292
Also adds aarch64-darwin support

(cherry picked from commit 00090e0fa4)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-06-01 09:58:11 +02:00
github-actions[bot]
65e3e9dc51
Merge master into staging-next 2021-06-01 07:50:21 +00:00
Jörg Thalheim
97098e5beb
Merge pull request #125132 from zhaofengli/rust-riscv
rust: Bootstrap riscv64
2021-06-01 06:46:18 +02:00
Zhaofeng Li
6288319a3a rust: Add support for riscv64 2021-05-31 14:55:35 -07:00
Zhaofeng Li
8f80568885 llvm{9,11}: Disable tests on RISC-V
The test suite leads to nothing but tears, sorrow, and wasted build
time. It probably should be disabled for all of them but doing only
9 (llvmPackages) and 11 (llvmPackages_latest, Rust) for now. Some of
the failures have been fixed in LLVM main:

- https://reviews.llvm.org/D97490
- https://reviews.llvm.org/D91043
2021-05-31 14:55:19 -07:00
github-actions[bot]
2867d5301f
Merge master into staging-next 2021-05-30 19:15:10 +00:00
Christian Kögler
ba677b14dd halide: Fix build 2021-05-30 14:18:57 +02:00
Ben Siraphob
766e933d9c passerine: init at 0.9.2 2021-05-29 18:42:30 +07:00
github-actions[bot]
f2a2e8f5e9
Merge master into staging-next 2021-05-28 12:48:40 +00:00
Daniël de Kok
1da0b1dbc9
Merge pull request #122158 from danieldk/import-cargo-lock
rustPlatform.buildRustPackage: support direct use of Cargo.lock
2021-05-28 12:07:25 +02:00
Daniël de Kok
b3969f3ad7 rustPlatform.buildRustPackage: support direct use of Cargo.lock
This change introduces the cargoLock argument to buildRustPackage,
which can be used in place of cargo{Sha256,Hash} or cargoVendorDir. It
uses the importCargoLock function to build the vendor
directory. Differences compared to cargo{Sha256,Hash}:

- Requires a Cargo.lock file.
- Does not require a Cargo hash.
- Retrieves all dependencies as fixed-output derivations.

This makes buildRustPackage much easier to use as part of a Rust
project, since it does not require updating cargo{Sha256,Hash} for
every change to the lock file.
2021-05-28 08:01:28 +02:00
Daniël de Kok
2f46d77e28 rustPlatform.importCargoLock: init
This function can be used to create an output path that is a cargo
vendor directory. In contrast to e.g. fetchCargoTarball all the
dependent crates are fetched using fixed-output derivations. The
hashes for the fixed-output derivations are gathered from the
Cargo.lock file.

Usage is very simple, e.g.:

importCargoLock {
  lockFile = ./Cargo.lock;
}

would use the lockfile from the current directory.

The implementation of this function is based on Eelco Dolstra's
import-cargo:

https://github.com/edolstra/import-cargo/blob/master/flake.nix

Compared to upstream:

- We use fetchgit in place of builtins.fetchGit.
- Sync to current cargo vendoring.
2021-05-28 08:01:25 +02:00
github-actions[bot]
a673990e6c
Merge master into staging-next 2021-05-25 18:43:22 +00:00
Daniël de Kok
7eddab91f5
Merge pull request #123867 from danieldk/maturin-0.10.5
maturin: 0.10.4 -> 0.10.6
2021-05-25 16:01:47 +02:00
github-actions[bot]
0615bb674f
Merge master into staging-next 2021-05-25 00:59:01 +00:00
Sandro
db2166a2d3
Merge pull request #121114 from samuela/patch-2 2021-05-25 02:30:22 +02:00
Sandro
f76f2011a8
Merge pull request #123513 from lourkeur/oraclejdk_ffmpeg 2021-05-25 02:28:32 +02:00
github-actions[bot]
141439f6f1
Merge master into staging-next 2021-05-24 18:41:50 +00:00
Patrick Hilhorst
3e91f422fd
gcc11: use maintainer team 2021-05-24 15:02:14 +02:00
Patrick Hilhorst
c913e53bdb
gcc*: use maintainer team 2021-05-24 15:01:05 +02:00
github-actions[bot]
2aa5735c09
Merge master into staging-next 2021-05-23 18:33:25 +00:00
Sandro
c069693226
Merge pull request #123441 from timothyklim/scala2_13_6 2021-05-23 17:10:05 +02:00
Daniël de Kok
11307c1d47 maturinBuildHook: add rustc to deps
maturin 0.10.5 uses rustc -vV to find the host:

e886c85f5a

We now need to make rustc visible to the hook for maturin to work
properly.
2021-05-21 07:51:27 +02:00
github-actions[bot]
0a0c0a9fb9
Merge staging-next into staging 2021-05-20 18:36:04 +00: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
Farid Zakaria
649f8b67ac jdk8: Remove default java.library.path
This patch fixes https://github.com/NixOS/nixpkgs/issues/103493 for JDK8
only.

I'm upstreaming only for JDK8 to get quorum on the approach and then
adding the patches to the remaining versions.

Improved JDK8 patch

Improved JDK8 patch
2021-05-19 12:36:32 -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
github-actions[bot]
9c9882ecd9
Merge staging-next into staging 2021-05-19 18:34:13 +00: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]
0dde2df969
Merge staging-next into staging 2021-05-19 00:55:40 +00:00
github-actions[bot]
7000ae2b9a
Merge master into staging-next 2021-05-19 00:55:36 +00:00
John Ericson
8a9d3ed361
Merge pull request #123551 from sternenseemann/clang-fix-llvmgold-path
llvmPackages*.clang: fix linker invocation with LLVMgold plugin
2021-05-18 15:04:08 -07:00
github-actions[bot]
99a3061e9f
Merge staging-next into staging 2021-05-18 18:36:38 +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
sternenseemann
3530837417 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.
2021-05-18 16:15:03 +02:00
Louis Bettens
50cb5bc35c oraclejdk*: use latest ffmpeg 2021-05-18 15:03:45 +02:00
Samuel Ainsworth
1e7f3bf0be julia_15: add comment clarifying broken-ness 2021-05-18 01:01:34 -07:00
Samuel Ainsworth
9ab3e892fe julia_15: run test suite and mark as broken
Fixes https://github.com/NixOS/nixpkgs/issues/121101.
2021-05-18 01:00:59 -07:00
Pontus Stenetorp
61b8bf948e
julia: mark julia_10-bin as insecure 2021-05-18 07:37:24 +00:00
Timothy Klim
a98f5738d2 scala_2_13: 2.13.5 → 2.13.6
dotty: 3.0.0-RC3 → 3.0.0
2021-05-18 09:43:12 +07:00
John Ericson
6ad0e5cab2
Merge pull request #123419 from sternenseemann/gcc-native-cross
gcc*: force building a cross compiler if host and target platform differ
2021-05-17 16:05:03 -07:00
sternenseemann
2d176b593b gcc*: force building a cross compiler if host and target platform differ
gcc's configure system has the nasty habit (for us) of judging for
itself if it is building a cross compiler (or cross compiling), but on
the limited information of the build, host and target platforms' config
which only contains a subset of the information we encode in
`stdenv.*Platform`. The practical consequence was that prior to this
change building `pkgsLLVM.buildPackages.gcc` actually fails because it
refuses to use `--with-headers` with something it believes to not be a
cross compiler.

As a workaround we force the appropriate variable in the configure
script to always be `yes` regardless of its own conditional check.

At some point we probably should report this issue in some capacity, so
future gcc versions don't force us into workarounds like this and
acdc783418.
2021-05-18 00:16:54 +02:00
Sandro
cf6be149b8
Merge pull request #123116 from SubhrajyotiSen/kotlin-1.5
kotlin: 1.4.32 -> 1.5.0
2021-05-17 19:11:05 +02:00
Luka Blaskovic
ded99630e9 rustc: 1_52, use correct llvm version 2021-05-17 08:40:12 -07:00
sternenseemann
f90244c970 haskell.compiler.ghcHEAD: disable DWARF on non x86
The broken build of ghcHEAD on aarch64-linux results from rts/Libdw.c
not supporting that platform. Seemingly this particular file is only
relevant for DWARF support in GHC, so we disable that on unsupported
platforms.
2021-05-17 17:22:47 +02:00
Jonathan Ringer
c227fb4b17
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/tools/rust/cargo-cache/default.nix
	pkgs/development/tools/rust/cargo-embed/default.nix
	pkgs/development/tools/rust/cargo-flash/default.nix
	pkgs/servers/nosql/influxdb2/default.nix
2021-05-17 07:01:38 -07:00
Michael Raskin
183350a3e1
Merge pull request #123188 from ninjin/julia-bin
julia: init julia_10-bin and julia_16-bin
2021-05-17 11:55:37 +00:00
github-actions[bot]
3ff6965554
Merge master into staging-next 2021-05-17 06:22:23 +00:00
Lorenzo Manacorda
e906410c9a solc: remove 0.7 release
They're failing on Hydra, the workload to keep them working is not worth it.
2021-05-16 22:44:21 -07:00
Ben Siraphob
682578af42 openjdk: move unzip to nativeBuildInputs 2021-05-16 19:29:28 -07:00
Jonathan Ringer
d8e62d8e41
Merge remote-tracking branch 'origin/master' into staging-next
Fix cargo-flash build
2021-05-16 18:27:14 -07:00
Sandro
700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
Stéphan Kochen
9716355b45 inform6: fix darwin build 2021-05-16 14:31:43 -07:00
Elliot Cameron
08ab7e10f3 go_2-dev: 2021-03-22 -> 2021-04-13 2021-05-17 06:15:35 +10:00
sternenseemann
9e5896496c Merge remote-tracking branch 'origin/master' into haskell-updates 2021-05-16 21:39:44 +02:00
Andrew Childs
56fcbcd154 llvmPackages_11: darwin cross compilation and bootstrapping 2021-05-17 00:28:05 +09:00
Finn Behrens
417a96c8be sbcl: update to 2.1.2 and add arm64-darwin
(cherry picked from commit 49d2ad093ecd54f40550745f240dda8dbf0ce920)
2021-05-17 00:28:04 +09:00
Andrew Childs
c99904e113 clang_11: revert -fno-common default 2021-05-17 00:27:02 +09:00
Pontus Stenetorp
8949ae188a
julia: init julia_10-bin at 1.0.5
Almost as clean as it could be, but was forced to set `LD_LIBRARY_PATH`
to work around a `Libdl` failure that is unique to v1.0.x.
2021-05-16 14:12:37 +00:00
Pontus Stenetorp
351f9114b0
julia: init julia_16-bin at 1.6.1
Relevant patches lifted from the `release-1.6` branch of my Julia fork:

    https://git.sr.ht/~ninjin/julia-nix/tree/release-1.6
2021-05-16 14:12:36 +00:00
Andy Chun @noneucat
fe42dee030 cudatoolkit: set CUDA_HOST_COMPILER cmake flag to supported gcc version 2021-05-16 04:42:15 -07:00
(cdep)illabout
f75fe9394f
Merge remote-tracking branch 'origin/master' into haskell-updates 2021-05-16 16:56:34 +09:00
(cdep)illabout
d1de348fdc
haskell.compiler.ghcHEAD: mark broken on aarch64 2021-05-16 16:52:08 +09:00
github-actions[bot]
5c18268a6b
Merge staging-next into staging 2021-05-16 06:22:08 +00:00
github-actions[bot]
d6fe7f78a8
Merge master into staging-next 2021-05-16 06:22:05 +00:00
Jörg Thalheim
3280de8b8c
Merge pull request #123125 from lopsided98/rustc-armv5tel
rustc: allowing building for ARMv5
2021-05-16 04:48:16 +01:00
John Ericson
4236fb1c7f
Merge pull request #123103 from sternenseemann/compiler-rt-resources
llvmPackages_{7-12}.compiler-rt: install resource files to DATADIR
2021-05-15 12:06:57 -07:00
github-actions[bot]
c10600230e
Merge staging-next into staging 2021-05-15 18:30:31 +00:00
sternenseemann
74f709f62e llvmPackages_{7,8,9}: link ${compiler-rt.out}/share to resource root
This is done for 10-12, but not for the earlier llvm package sets.
2021-05-15 18:35:44 +02:00
sternenseemann
0046076950 llvmPackages_{7-12}.compiler-rt: install resource files to DATADIR
This is in an effort to fix the following build failure shown by
chromium:

    clang++: error: no such file or directory: '/nix/store/fhd89wrmkx6nflzjk0d6waz70bk3zc4i-clang-wrapper-12.0.0/resource-root/share/cfi_blacklist.txt'

As it turns out a change introduced via the gnu-install-dirs.patch
caused `add_compiler_rt_resource_file` to install resource files to
$dev/include (FULL_INCLUDEDIR) instead of $out/share (FULL_DATADIR)
which in turn meant that the clang wrappers we had didn't link those
files to its resource root at all.

Alternative fix to this would have been to link
compiler-rt.dev/include/*.txt to the wrappers resource-root/share as
well, but since this was handled inconsistently across the patch anyways
(the dfsan list is installed correctly), opt to handle this
consistently within the patch.

llvmPackages_{5,6} install the resource files to a completely different
location and need separate investigation.
2021-05-15 18:35:43 +02:00
Ben Wolsieffer
9d6134ae6d rustc: allowing building for ARMv5
toRustTarget needed to handle the armv5tel case
2021-05-15 11:43:51 -04:00
sternenseemann
91cba7b0a9 llvmPackages_{10,11,12}.compiler-rt: install resource txts to $out/share
7869d16545 changed how resource files are
installed. Likely by accident, now some of the resource files are
installed to $dev/include instead of $out/share. This causes the cc
wrapper's resource-root to miss those files from compiler-rt as they are
in a different place than expected.

This commit fixes all instances of this incorrect installation for
llvmPackages_10, 11 and 12 which are the only llvm package sets which
link ${targetLlvmLibraries.compiler-rt.out}/share to the resource-root.

For the other llvm package set this will likely also need to be fixed,
but it doesn't have to have immediate urgency and doing it in two steps
allows us to (hopefully) fix the chromium build without causing a darwin
stdenv rebuild.

The full fix can be found in #123103 and should probably be included in
the next staging-next rotation.
2021-05-15 17:40:24 +02:00
Subhrajyoti Sen
e20a3b4326 kotlin: 1.4.32 -> 1.5.0 2021-05-15 19:46:17 +05:30
github-actions[bot]
78ae7ac75e
Merge staging-next into staging 2021-05-15 06:22:25 +00:00
Jonathan Ringer
0546e68ef7
Merge remote-tracking branch 'origin/master' into staging-next 2021-05-14 21:57:09 -07:00
John Ericson
7dd53fe56e
Merge pull request #122778 from Ericson2314/choose-linker
treewide: Allow the linker to be chosen independently
2021-05-14 18:53:14 -04:00
John Ericson
93e6a25f50
Merge pull request #123047 from sternenseemann/usellvm-lunwind
llvmPackages_*.lldClang: pass -lunwind if exceptions are enabled
2021-05-14 18:51:34 -04:00
sternenseemann
f506019942 llvmPackages_*.lldClang: pass -lunwind if exceptions are enabled
To successfully compile C++ with useLLVM we need an unwinder and
thus to explicitly -lunwind like it has been done for the android
cross targets.
2021-05-15 00:34:50 +02:00
Stéphan Kochen
f91dcdd7b5
copper: broken on darwin (#123030) 2021-05-14 17:35:55 -04:00
John Ericson
18c38f8aee treewide: All the linker to be chosen independently
This will begin the process of breaking up the `useLLVM` monolith. That
is good in general, but I hope will be good for NetBSD and Darwin in
particular.

Co-authored-by: sterni <sternenseemann@systemli.org>
2021-05-14 21:29:51 +00:00
Vladimír Čunát
1a7ef60b2f
Merge #122803: llvm*: patch to fix a test on older CPUs 2021-05-14 22:31:23 +02:00
Vladimír Čunát
c48eaa70e3
Merge branch 'master' into staging-next 2021-05-14 22:27:34 +02:00
John Ericson
49d2653653
Merge pull request #122974 from sternenseemann/lldClang-no-double-wrap
llvmPackages_*.lldClang: don't wrap bintools twice
2021-05-14 14:52:57 -04:00
sternenseemann
f7b49ea2af llvmPackages_12.lld: make sure llvm libunwind is passed
lld needs LLVM's libunwind for its headers. That libunwind is not part
of the tools scope in pkgs/development/compilers/llvm/12/default.nix,
which means that lld previously received libunwind from top-level pkgs
which of course doesn't have the required headers.

To resolve this pass libunwind from the libraries scope — platform
concerns don't really mattern as only libunwind.src is used.

libunwind was initially passed correctly, but that was removed in
e830db4320. This regression was likely
introduced accidentally.
2021-05-14 16:23:12 +02:00
sternenseemann
3eaa00879c llvmPackages_*.lldClang: don't wrap bintools twice
The bintools argument received a wrapped version of tools.bintools which
is already wrapped. Wrapped bintools twice leads to users of lldClang
being unable to find the tools which are not wrapped like ar.
2021-05-14 12:50:41 +02:00
zowoq
004f8cd986 Merge staging-next into staging 2021-05-14 16:32:43 +10:00
AndersonTorres
cfd20fa9e1 zig: rewrite
substituteAll is not used anymore.
2021-05-14 00:22:12 -03:00
github-actions[bot]
bf5d8bb531
Merge master into staging-next 2021-05-14 00:58:11 +00:00
Jan Tojnar
ac6a4f7cf5
Merge branch 'staging-next' into staging 2021-05-14 01:40:09 +02:00
Sandro
6920440a69
Merge pull request #93043 from dasj19/mono6-update
mono5: 5.20.1.27 -> 5.20.1.34
2021-05-13 23:34:23 +02:00
github-actions[bot]
39e3f7c2cc
Merge master into staging-next 2021-05-13 18:32:50 +00:00
Matthias Devlamynck
ef2742bcde elm-instrument: fix build 2021-05-13 09:36:51 -07:00
Jan Tojnar
0313c77b55
Merge branch 'staging-next' into staging 2021-05-13 11:42:36 +02:00
Vladimír Čunát
ea306f6dfc
llvm*: patch to fix a test on older CPUs
- 10, 11, 12: use the upstream patch
- 9: use Luke's patch as the upstream patch won't apply
2021-05-13 10:43:45 +02:00
github-actions[bot]
a8e5ac148b
Merge master into staging-next 2021-05-13 00:56:26 +00:00
Vladimír Čunát
ba2140b657
Merge #122044: compiler-rt: Fix build by passing resource dir
Fast-forwarded from staging to staging-next.  See:
https://github.com/NixOS/nixpkgs/pull/111487#issuecomment-840088733
2021-05-12 22:55:14 +02:00
John Ericson
22da550728
Fast-forward PR #122399 from staging to staging-next
compiler-rt: Revert passing `COMPILER_RT_OS_DIR` and not symlinking libs
(cherry picked from commit 680b33fe37)
https://github.com/NixOS/nixpkgs/pull/111487#issuecomment-840078869
2021-05-12 22:43:52 +02:00
Jan Tojnar
71fa678899
Merge branch 'staging-next' into staging 2021-05-12 14:31:36 +02:00
Vladimír Čunát
7178848064
ghdl-llvm: fix llvm output selection 2021-05-12 10:51:11 +02:00
John Ericson
e830db4320 llvmPackages: Fix more inconsistencies
The main thing was using `llvm_meta` in all versions.

Secondarily:

 - libunwindx7: Forgot to split outputs

 - libcxx{,abi} 12: Forgot to apply output-splitting patches.

 - simplify `useLLVM` stdenv-switching logic.

 - openmp always gets its own directory
2021-05-12 00:16:11 +00:00
John Ericson
37194a325d treewide: Try to make a few bootstrapping things more consistent
- Introduce `preLibcCrossHeaders` to bootstrap libgcc and compiler-rt
  the same way.

- Organize LLVM bintools as `bintools{-unwrapped,,NoLibc}` for
  consistency with GNU Binutils and Apple's cctools.

- Do Android changes for all `llvmPackages` for consistency.

- Improve the way the default GCC and LLVM versions are selected.
2021-05-12 00:14:56 +00:00
John Ericson
e0d3c9d031 llvmPackages*.libcxx*: Always use the attribute name for pname
This decision was made in a902d99422 but
just for LLVM 12. Now we apply it consitently.
2021-05-12 00:14:56 +00:00
John Ericson
894f0c6ec8 llvmPackages: Always put libunwind before openmp
This keeps the "main bootstrap" together.
2021-05-12 00:13:13 +00:00
sternenseemann
4caedc060f llvmPackages_12.libunwind: Make sure we get right llvm version 2021-05-12 00:12:51 +00:00
sternenseemann
894a09dfd2 llvmPackages_7.lldClang: add libunwind to extraLibraries 2021-05-12 00:12:40 +00:00
sternenseemann
53adcfb798 llvmPackages_7.libunwind: simplify expressions
* Use LLVM_PATH instead of llvm-config
* Pass less unnecessary options to cmake
2021-05-12 00:08:02 +00:00
John Ericson
cf02b24813 Merge remote-tracking branch 'upstream/staging-next' into staging 2021-05-11 22:30:46 +00:00
Vladimír Čunát
ec97081437
Merge #122554: llvm*Packages: fix output selection 2021-05-11 22:08:44 +02:00
Stéphan Kochen
3cf4c5d09b swiProlog: fix darwin build 2021-05-11 21:10:57 +02:00
github-actions[bot]
37c26a396b
Merge master into staging-next 2021-05-11 18:28:07 +00:00
John Ericson
912c8262b4
Merge pull request #117591 from s1341/android_non_prebuilt
treewide: Support aarch64-android using minimal prebuilt components
2021-05-11 12:49:53 -04:00
s1341
1e1d29c2af treewide: Support aarch64-android using minimal prebuilt components
This PR adds a new aarch64 android toolchain, which leverages the
existing crossSystem infrastructure and LLVM builders to generate a
working toolchain with minimal prebuilt components.

The only thing that is prebuilt is the bionic libc. This is because it
is practically impossible to compile bionic outside of an AOSP tree. I
tried and failed, braver souls may prevail. For now I just grab the
relevant binaries from https://android.googlesource.com/.

I also grab the msm kernel sources from there to generate headers. I've
included a minor patch to the existing kernel-headers derivation in
order to expose an internal function.

Everything else, from binutils up, is using stock code. Many thanks to
@Ericson2314 for his help on this, and for building such a powerful
system in the first place!

One motivation for this is to be able to build a toolchain which will
work on an aarch64 linux machine. To my knowledge, there is no existing
toolchain for an aarch64-linux builder and an aarch64-android target.
2021-05-11 15:39:08 +00:00
Ben Siraphob
191f50f669 z88dk: 2.0 -> 2.1 2021-05-11 19:46:01 +07:00
Vladimír Čunát
8eabe2ecc5
Merge #115235: gcc: native aarch64-darwin support 2021-05-11 12:12:04 +02:00
Vladimír Čunát
79762fcb4a
Merge #121772: gcc*: do not modify code in prePatch 2021-05-11 12:01:38 +02:00
Vladimír Čunát
6b3b7940ff
llvm*Packages: fix output selection (lib.get*) 2021-05-11 10:45:11 +02:00
Jan Tojnar
7982550ac4
Merge branch 'staging-next' into staging 2021-05-11 09:09:10 +02:00
Ivan Babrou
4aa95e3312 gcc: native aarch64-darwin support 2021-05-10 19:07:30 -07:00
Jonathan Ringer
4bb359aa99 rustc: 1.52.0 -> 1.52.1 2021-05-10 16:00:44 -07:00
github-actions[bot]
61fa3fdde8
Merge master into staging-next 2021-05-10 18:28:17 +00:00
Vladimír Čunát
09a56d71bb
Merge #121759: gfortran11, gnat11: init at 11.1.0 2021-05-10 19:52:49 +02:00
Jan Tojnar
594a885912
Merge branch 'staging-next' into staging 2021-05-10 09:45:47 +02:00
John Ericson
8629936f82 compiler-rt: Revert passing COMPILER_RT_OS_DIR and not symlinking libs
In 7869d16545 I got rid of the symlinking
by forcing `COMPILER_RT_OS_DIR` to always be the empty string. I thought
this was good because it just make compiler-rt be installed in a normal
way.

However, various LLVM tools expect the `COMPILER_RT_OS_DIR` to be set
normally, and fail to find things when they aren't in the expected lib
subdir.

Maybe it would be best to patch that too in the long term, but for now
we just undo this change.
2021-05-09 22:52:09 +00:00
Vladimír Čunát
5663b2b2d3
Merge branch 'master' into staging-next
(a trivial conflict in transmission)
2021-05-09 09:31:55 +02:00
R. RyanTM
b4833b346c gleam: 0.15.0 -> 0.15.1 2021-05-09 14:37:43 +09:00