Commit Graph
9680 Commits
Author SHA1 Message Date
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 ChildsandJohn Ericson 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
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
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
(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 Ericsonandsterni 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