Commit Graph
334077 Commits
Author SHA1 Message Date
github-actions[bot]andGitHub 700540c4fb Merge staging-next into staging 2021-11-25 00:02:31 +00:00
github-actions[bot]andGitHub b244d0edca Merge master into staging-next 2021-11-25 00:01:54 +00:00
a988b71a09 plasma-hud: init at 19.10.1 (#74085)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-11-25 01:00:48 +01:00
SandroandGitHub 4b3b13c9c7 Merge pull request #128145 from viric/tribler-master2 2021-11-25 00:50:13 +01:00
SandroandGitHub 4b1cc25ab2 Merge pull request #145536 from nazarewk/keepass-keetraytotp 2021-11-25 00:48:47 +01:00
SandroandGitHub 36a49b67d0 Merge pull request #145054 from oxzi/flask-httpauth-4.5.0 2021-11-25 00:46:15 +01:00
SandroandGitHub e1be6bd30d Merge pull request #146299 from johnrichardrinehart/postman/9.1.4 2021-11-25 00:45:45 +01:00
John EricsonandGitHub f721e0f849 Merge pull request #145107 from Ericson2314/buildRustCrate-sysroot
build-support/rust: Fix sysroot for cross
2021-11-24 18:44:13 -05:00
SandroandGitHub b82fe8ab45 Merge pull request #140382 from onny/audiosprite 2021-11-25 00:36:04 +01:00
SandroandGitHub 9a58394bad Merge pull request #146954 from DeeUnderscore/xh-0.14.0 2021-11-25 00:35:07 +01:00
SandroandGitHub bb64901d62 Merge pull request #145863 from dotlambda/pybind11-2.8.1 2021-11-25 00:33:50 +01:00
SandroandGitHub a141e6eab6 Merge pull request #147192 from risicle/ris-pyeclib-darwin 2021-11-25 00:33:03 +01:00
SandroandGitHub 6809351d92 Merge pull request #147003 from samuelgrf/mpv-inherit-meta 2021-11-25 00:31:08 +01:00
SandroandGitHub ebfff50fe2 Merge pull request #147310 from SuperSandro2000/delta 2021-11-25 00:28:13 +01:00
SandroandGitHub c669e5f566 Merge pull request #146813 from erictapen/nbclient 2021-11-25 00:24:36 +01:00
SandroandGitHub 3176c8243e Merge pull request #141515 from kfollesdal/kfollesdal/typical 2021-11-25 00:23:54 +01:00
SandroandGitHub 398d2c540b Merge pull request #144083 from VergeDX/nrm 2021-11-25 00:19:42 +01:00
SandroandGitHub 51ae6157b1 Merge pull request #146520 from sei40kr/notion-enhancer 2021-11-25 00:17:30 +01:00
Domen KožarandGitHub f65ef93cb0 Merge pull request #147039 from johnbcoughlin/patch-1
_1password: Add aarch64-darwin to platforms list
2021-11-25 00:17:18 +01:00
toonnandJonathan Ringer 5d23e617ec stdenv: Pass standalone argument for libcxxabi 2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 21df776a31 llvmPackages_13.libcxxabi: Align with 11 libcxxabi
LLVM 11 libcxxabi has some flags to support usage in the Darwin stdenv,
in particular, `standalone` and `withLibunwind`.

Darwin stdenv needs the `standalone` flag because its `hostPlatform` set
doesn't have `useLLVM` set to true. And it needs `withLibunwind` to
explicitly disable including `libunwind` as a build input.

We also prefix `install_name_tool` in case we're cross-compiling.
2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer d90fb1c038 llvmPackages_12.libcxxabi: Align with 11 libcxxabi
LLVM 11 libcxxabi has some flags to support usage in the Darwin stdenv,
in particular, `standalone` and `withLibunwind`.

Darwin stdenv needs the `standalone` flag because its `hostPlatform` set
doesn't have `useLLVM` set to true. And it needs `withLibunwind` to
explicitly disable including `libunwind` as a build input.

We also prefix `install_name_tool` in case we're cross-compiling.
2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer d964f211f6 llvmPackages_11.libcxxabi: More precise libunwind inclusion 2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 24dd96ebd4 cups: Only apply patch for appropriate version 2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 8edba0e217 groonga: Switch to autoreconfHook
Use `autoreconfHook` rather than manually running `aclocal`.
Clarify removal of `version` file.
2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 787a8b85fb mariadb: Add comment to clarify version file renames 2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer e33c11a557 Libc: Merge TARGET_OS_EMBEDDED patches
Both patches implement the same fix so they'll probably have to be
removed at the same time. This avoids one of them being left behind.
2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 19678c4e90 libtiff: Clarify patch comments 2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 33e89d4134 release.nix: Re-enable full stdenv bootstrap test 2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 9b277c2891 sphinx: Normalize the filename with NFC
The original problem with the normalization of the filename only
occurred because it was in NFC. However, when trying to fix it by
`mv`ing the file to a normalization-indifferent name, I used the NFD
normalized name from my file system. This means it only works on
normalizing file systems. The filename must be in the original encoding
and will be normalized by normalizing file systems like HFS+.
2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer cb3813b7b6 wheel: Normalize the filename with NFC
The original problem with the normalization of the filename only
occurred because it was in NFC. However, when trying to fix it by
`mv`ing the file to a normalization-indifferent name, I used the NFD
normalized name from my file system. This means it only works on
normalizing file systems. The filename must be in the original encoding
and will be normalized by normalizing file systems like HFS+.
2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 1be74eb17d cffi: Silence warning causing test failures 2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 169c34a6a7 cffi: Include pkg-config
The build was falling back on impure paths because pkg-config was
missing. This caused a mismatch between headers picked up at
compile-time and run-time, specifically `ffi.h` from libffi and then one
in `/usr/include/ffi` on macOS.
2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 54b5495e4e cffi: Reenable checks to reveal Darwin problem
This problem can now be considered investigated.
2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer c14efb0586 cffi: Drop unnecessary libm substitutes 2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 1f8566980d cryptography: Drop impure host deps
Nix 1.11 has long come and gone. It seems this is no longer necessary.
2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 8e1914d43f sphinx: Update FOD source hash
The hash has changed because of the renamed file but will no longer vary
depending on whether the filesystem where it is calculated is
case-sensitive or not.
2021-11-24 15:17:13 -08:00
Ryan BurnsandJonathan Ringer 35ddc19667 libtiff: fix case-insensitive build 2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 40b7dd7cce pulseaudio: Stop passing sdk argument 2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 7eaf240e72 pulseaudio: Drop Apple SDK dependency
The x86_64 and aarch64 SDK attributes are named differently and don't
have the same contents. This was the motivation to try dropping the SDK
dependency altogether, relying only on the Libc and some frameworks.
2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 18ba22baba pulseaudio: Remove /usr/include impurity on Darwin 2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 3ed6885aa8 wheel: Fix hash mismatch due to filesystem normalization
One file in the testdata has a name with accented unicode characters
that can be encoded differently depending on normalization. This causes
Nix to calculate a different hash for the tarball output depending on
whether or not and which unicode normal form the filesystem uses.

This is worked around by renaming the file to consist of unicode
characters that are unaffected by normalization. The file is renamed and
the test patched in the `extraPostFetch` phase of the the fetcher.
2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 459dc34b2b Libc: Define target in stdio too 2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 5aa4c46dcd Libc: Define target instead of including
Including `TargetConditionals.h` had knock-on effects, breaking the zlib
build because `TARGET_OS_MAC` gets defined, for instance.

Defining `TARGET_OS_EMBEDDED` to be `0` if it's not defined is simpler
and maintains the default behavior so it shouldn't break any dependents.
2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 99bef31835 Libc: stdlib uses undefined TARGET_OS_EMBEDDED 2021-11-24 15:17:13 -08:00
36a953f78c cups: Apply patch unconditionally
Co-authored-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 63686605e9 sphinx: Disable most networking tests on Darwin 2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer be6bf14e4a sphinx: Disable test_inspect_main_url on Darwin 2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 504b89e2d3 groonga: Fix LLVM 11 build by removing version file 2021-11-24 15:17:13 -08:00
toonnandJonathan Ringer 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