Commit Graph

333945 Commits

Author SHA1 Message Date
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
sterni
9ee20db964
Merge pull request #146621 from NixOS/haskell-updates
haskellPackages: update stackage and hackage
2021-11-24 10:41:56 +01:00
Fabian Affolter
c0678efd82
Merge pull request #146976 from fabaff/bump-autobahn
python3Packages.autobahn: 21.3.1 -> 21.11.1
2021-11-24 10:27:22 +01:00
sternenseemann
c32095b400 ghcWithPackages: rename withLLVM to useLLVM
useLLVM is what we are using in the GHC derivations already -- for
better or for worse -- so we should rename the argument here for
consistency which we are free to do as this is purely internal at the
moment (with overriding being impossible).
2021-11-24 10:21:39 +01:00
sternenseemann
9be4a33018 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-11-24 10:17:44 +01:00
Frederik Rietdijk
6dc2edb831 python3.pkgs.pandas: remove optional dependencies 2021-11-24 09:54:17 +01:00
Pavol Rusnak
d6d496e525
Merge pull request #146628 from erikarvstedt/btcpayserver-1.3.5
btcpayserver: 1.3.3 -> 1.3.6
2021-11-24 09:51:42 +01:00
Vladimír Čunát
a7f2cd867a
xorg.xf86videoqxl: patch build after bool rename 2021-11-24 09:48:25 +01:00
Jörg Thalheim
48e0fd8005
Merge pull request #147221 from lionello/fix-dtools-aarch64-darwin
dtools: Fix aarch64-darwin build
2021-11-24 08:37:53 +00:00
Vladimír Čunát
0649fcdf26
xorg.xorgserver: apply upstream patch
This fixes xorg.xf86videovmware build (channel blocker).
2021-11-24 09:10:11 +01:00
Lio李歐
d051071e20
Update pkgs/development/tools/dtools/default.nix
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
2021-11-24 00:05:33 -08:00
Sebastián Mancilla
40c3bc3b08
pytho3Packages.m3u8: use upstream patch (#147163)
Follow up to 2b84c77b3e (python3Packages.m3u8: fix build on Hydra
(x86_64-darwin), 2021-11-19), now with upstream patch.
2021-11-24 02:46:33 -05:00
Robert Schütz
1722f697f8 python3Packages.imap-tools: 0.50.0 -> 0.50.1
https://github.com/ikvk/imap_tools/releases/tag/v0.50.1
2021-11-23 23:36:43 -08:00
Fabian Affolter
9bfd3e7ee3
Merge pull request #147200 from fabaff/bump-pyzerproc
python3Packages.pyzerproc: 0.4.9 -> 0.4.10
2021-11-24 08:31:30 +01:00
Fabian Affolter
ac588be2b6
Merge pull request #147198 from fabaff/bump-pykulersky
python3Packages.pykulersky: 0.5.2 -> 0.5.3
2021-11-24 08:31:19 +01:00