3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

333959 commits

Author SHA1 Message Date
toonn 63686605e9 sphinx: Disable most networking tests on Darwin 2021-11-24 15:17:13 -08:00
toonn be6bf14e4a sphinx: Disable test_inspect_main_url on Darwin 2021-11-24 15:17:13 -08:00
toonn 504b89e2d3 groonga: Fix LLVM 11 build by removing version file 2021-11-24 15:17:13 -08:00
toonn 2a97abdc21 Qt5: WebEngine build with old LLVM
Qt Base is built with LLVM 5 on Darwin. LLVM 11 causes problems for
WebEngine because of the "version" includes in libc++abi. LLVM 7 would
work but since parts are built with LLVM 5 anyway it seemed like a more
straightforward option.
2021-11-24 15:17:13 -08:00
toonn 8b09fd98eb mariadb: Rename "version" files for LLVM 11
Libc++abi 11 has `#include <version>` in some places. This clashes with
projects that have files named "version" in directories that end up on
the include path. This includes files named "VERSION" on
case-insensitive file systems.
2021-11-24 15:17:13 -08:00
toonn b1b5b40c8d Qt5: WebEngine turn off warning causing errors
Co-authored-by: Jonathan Ringer <jonringer117@gmail.com>
2021-11-24 15:17:13 -08:00
toonn 2253728351 sphinx: Patch source file for normalization
One of the test files has a different encoding depending on the
filesystem's normalization. By picking a character that does not have
multiple possible encodings we make the source indifferent to
normalization. This allows the FOD hash to match across platforms with
differently normalizing filesystems.
2021-11-24 15:17:13 -08:00
toonn ea50c9776c cups: Change condition so patch won't remain forever
By changing the condition for the patch it'll hopefully break when the
version is updated for Darwin and not stick around forever.

Co-authored-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
2021-11-24 15:17:13 -08:00
toonn 530b000f09 portaudio: Fix version mashup
Co-authored-by: Pavol Rusnak <pavol@rusnak.io>
2021-11-24 15:17:13 -08:00
toonn 73d3d0de7f libcxxabi: Use standalone instead of expression
Co-authored-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
2021-11-24 15:17:13 -08:00
toonn b02908c213 libtiff: Reenable OpenGL support on Darwin
I found the correct inputs to get `libtiff` to compile with OpenGL
support on Darwin. Allowing us to get rid of the ugly build system
patch.
2021-11-24 15:17:13 -08:00
toonn 3791134fa0 portaudio: Disable new clang-11 warning
Clang 11 complains about implicit conversion from int to float so we
disable `-Wimplicit-const-int-float-conversion`. The conversion causes a
difference in the constant of 1, so how bad can it be? ; )
2021-11-24 15:17:13 -08:00
toonn e4d62a5ad5 mariadb: Avoid building with clang-11
libcxx-11.1.0 uses `#include <version>` in several places. There's a
`storage/mroonga/version` file in the mariadb source and this gets
picked up by libcxx when building mroonga but that file doesn't contain
valid source code.

To avoid the issue altogether we're sticking with a clang-7 stdenv to
build mariadb for now.

Based on 787f934b24 from LnL7's WIP LLVM 9
update.

Co-authored-by: Daiderd Jordan <daiderd@gmail.com>
2021-11-24 15:17:13 -08:00
toonn 5a12a87aed cups: Include TargetConditionals.h on Darwin 2021-11-24 15:17:13 -08:00
toonn d0c5ac2383 libtiff: Disable OpenGL entirely for Darwin
On the Hydra builders and with Clang 7, CMake fails to find OpenGL. With
Clang 11 it manages to find the the OpenGL and GLUT system frameworks
for me. It does not find `gl.h` however. So the tests for `tiffgt` fail
on a missing include.

Since previously OpenGL wasn't detected I've opted to disable the CMake
check for OpenGL for darwin. This means `tiffgt.c` is never built and
tested. Ideally we'd provide the proper headers so the tests can
succeed.
2021-11-24 15:17:13 -08:00
toonn 63a3ead084 stdenv: Darwin no longer needs 10.11 workaround
Co-authored-by: happysalada <raphael@megzari.com>
2021-11-24 15:17:13 -08:00
toonn 77fc5f8c14 bootstrap-tools: Introduce getLib for lib outputs
Co-authored-by: sternenseemann <sternenseemann@systemli.org>
Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
2021-11-24 15:17:13 -08:00
Sandro Jäckel 7e9d442837 darwin.CF: Add pre-/postBuild hooks to buildPhase 2021-11-24 15:17:13 -08:00
toonn 3b2d3f65b7 darwin.CF: Drop clang 7 workaround 2021-11-24 15:17:13 -08:00
toonn 2bb0e256ea darwin.CF: Include missing TARGET_OS_* defines
This patch is static and may not be appropriate if the compilation
target is iOS.
2021-11-24 15:17:13 -08:00
toonn 982f7228ff cmake: Temporarily pass flags
To mimic LLVM 7 behavior we need to pass `-Wno-elaborated-enum-base` in
`CXXFLAGS`. Ideally this gets fixed upstream and won't be necessary.
2021-11-24 15:17:13 -08:00
toonn 1be8e73fb3 stdenv: libcxxabi dropped standalone in favor of useLLVM
The libcxxabi expression had a `standalone` argument in LLVM 7 which
triggered passing of the `-DLLVM_ENABLE_LIBCXX=ON` flag. In LLVM 11 this
flag and others are toggled by the `useLLVM` attribute of
`stdenv.hostPlatform` but this toggles a flag we don't need on Darwin.

Similar to the refactoring of LLVM 7 libc++abi by Ericson2314 in
3af7e98470, I have reintroduced the standalone argument for use in
bootstrapping the Darwin stdenv.
2021-11-24 15:17:13 -08:00
toonn 9687654011 all-packages: Define LLVM 11 as the default for Darwin
The Darwin stdenv takes some of the llvmPackages from the top-level pkgs
rather than explicitly from `llvmPackages_*`. This means you cannot
simply bump the LLVM version in the stdenv, you have to bump the default
version in all-packages.nix as well.
2021-11-24 15:17:13 -08:00
toonn cc767e1d05 darwin.stdenv: Update to LLVM 11 and clang 11.1.0 2021-11-24 15:17:13 -08:00
toonn 84454c3233 darwin.Libsystem: Patch TargetConditionals.h
`TargetConditionals.h` was missing several definitions, like
`TARGET_OS_TV` that are part of SDK 10.12 at least. And one that doesn't
seem to occur in any SDK afaict, `TARGET_OS_EMBEDDED_OTHER`.

I added the definitions from SDK 10.12 verbatim and defined
`TARGET_OS_EMBEDDED_OTHER` to be equal to `0`.

I think none of this works if `darwin.Libsystem` is used to build for
linux or iOS though so maybe this needs a more thorough fix?

This reverts 336d82617f because it's no
longer necessary.
2021-11-24 15:17:13 -08:00
toonn e07eef85e8 xnu: Fix python3 patch
This reverts 7da313e10a because it's no
longer necessary.
2021-11-24 15:17:13 -08:00
Daiderd Jordan 7e4880c21b stdenv: update darwin bootstrap tools for llvm11
Build from bdffd0b276.

https://hydra.nixos.org/build/124753463
(cherry picked from commit f4a08349ed43a36ad5489a4ab548fcf0c129215d)
2021-11-24 15:17:13 -08:00
github-actions[bot] 31d821c969
Merge staging-next into staging 2021-11-24 18:01:40 +00:00
github-actions[bot] 4b11545cf7
Merge master into staging-next 2021-11-24 18:01:03 +00:00
Jonas Chevalier e623177029
Merge pull request #147067 from yurrriq/kops-1.22.2
kops: add 1.22.2, 1.21.1 -> 1.21.4, 1.20.2 -> 1.20.3, drop kops_1_19
2021-11-24 18:28:14 +01:00
Jonas Chevalier a973a78523
Merge pull request #146996 from bachp/gitlab-runner-image-helpers-from-registry
gitlab-runner: 14.4.0 -> 14.5.0
2021-11-24 18:24:03 +01:00
Finn Behrens 7dbdc0df77
corrosion: unstable-2021-02-23 -> unstable-2021-11-23 (#147244) 2021-11-24 18:05:31 +01:00
Alyssa Ross c4d7b1c52e spice: manually add file missing from tarball 2021-11-24 17:03:29 +00:00
Alyssa Ross 1df50b478a spice: remove use celt051 option
celt support has been removed upstream, and this option no longer
exists.  Setting an unknown option is a hard error with Meson ≥0.60.0.
2021-11-24 17:03:29 +00:00
Janne Heß fed85dd00b
Merge pull request #147168 from helsinki-systems/upd/varnish 2021-11-24 17:42:13 +01:00
Vladimír Čunát 4b675777b5
Merge #144950: firefox-(devedition|beta)-bin: 94.0b2 -> 95.0b3 2021-11-24 17:33:24 +01:00
Silvan Mosberger 1269aeb705
Merge pull request #146322 from GOKOP/master
translate-shell: added missing (runtime) dependency on hexdump
2021-11-24 14:46:09 +01:00
Thiago Kenji Okada ac4e63aaf1
Merge pull request #147255 from samuelgrf/htop-vim-mainProgram
htop-vim: add meta.mainProgram
2021-11-24 10:44:26 -03:00
Samuel Gräfenstein 63a61947b9
htop-vim: add meta.mainProgram 2021-11-24 14:21:02 +01:00
Vikram Narayanan 54514c38a4 watchdog: mark as unbroken on aarch64-darwin 2021-11-24 13:20:07 +00:00
markuskowa 4ec0d5209f
Merge pull request #146995 from sheepforce/qcelemental
python3.pkgs.qcelemental: 0.23.0 -> 0.24.0, python3.pkgs.qcengine: 0.20.1 -> 0.21.0
2021-11-24 13:50:34 +01:00
Martin Weinelt fff254979a
Merge pull request #147233 from dotlambda/imap-tools-0.50.1 2021-11-24 13:24:38 +01:00
Martin Weinelt 5d61b0b3af
Merge pull request #147246 from fabaff/fix-discord.py 2021-11-24 13:21:43 +01:00
José Romildo Malaquias b023bd4864
Merge pull request #146730 from thiagokokada/htop-vim-init
htop-vim: init at unstable-2021-10-11
2021-11-24 09:19:45 -03:00
Sandro 944568b2ea
Merge pull request #146877 from Mindavi/openh264/cross 2021-11-24 13:18:35 +01:00
Sandro 31c32857ac
Merge pull request #123917 from Mindavi/mosquitto/libwebsockets-4 2021-11-24 13:16:17 +01:00
github-actions[bot] 6959435521
Merge staging-next into staging 2021-11-24 12:01:56 +00:00
github-actions[bot] fc6ab3024e
Merge master into staging-next 2021-11-24 12:01:20 +00:00
Vladimír Čunát 39cb89ef2f
Merge #147238: xorg.xorgserver: apply upstream patch 2021-11-24 12:25:38 +01:00
Fabian Affolter 2dbcf92154 python3Packages.discordpy: relax aiohttp constraint 2021-11-24 11:03:41 +01:00