Staging next #123279

If things build fine with `stdenvNoCC`, let them use that. If tools might be prefixed, prepare for that, either by directly splicing or just using the env vars provided by the wrapper setup-hooks. Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>

darwin packages: Get ready for cross

* Use LLVM_PATH instead of llvm-config * Pass less unnecessary options to cmake

This keeps the "main bootstrap" together.

This decision was made in a902d99 but just for LLVM 12. Now we apply it consitently.

- 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.

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

treewide: Some LLVM / bootstrapping / cross cleanups especially for consistency

KDE Gear 21.04.0

This is automatic for Meson builds.

libsoup: fix building cpp applications after recent glib update

wayland: fix build on darwin

KDE Frameworks 5.81

- 10, 11, 12: use the upstream patch - 9: use Luke's patch as the upstream patch won't apply

They are the same version.

https://mail.gnome.org/archives/xml/2021-May/msg00000.html CVE-2021-3541

It fails for reasons unknown otherwise and pkg-config is better for cross-compilation anyway.

autogen: fix compilation on aarch64-darwin

gi-docgen: 2021.2 → 2021.5

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.

Plasma 5.21.5

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 e830db4. This regression was likely introduced accidentally.

Restore version in Qt derivation names

python2: only pass -msse2 on x86_64-darwin, not any darwin

llvmPackages_*.lldClang: don't wrap bintools twice

pkgsLLVM: cross compiled package set using llvm compilers

Add a comment with explanation, which I should have done all along.

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>

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.

llvmPackages_*.lldClang: pass -lunwind if exceptions are enabled

treewide: Allow the linker to be chosen independently

This patch was removed in 34f8d7e ("lua: one dso patch to rule them all"), and the reference to it in lua5_4 was removed at the time, but it seems to have found its way back somehow (probably through a merge?).

glib: 2.68.1 → 2.68.2

python3Packages.pytorch: unvendor pybind11

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.

This is done for 10-12, but not for the earlier llvm package sets.

llvmPackages_{7-12}.compiler-rt: install resource files to DATADIR

Since the hashes of the remaining two archives that used fetchurl broke, now as good a time as any to switch the remaining fetchurls to fetchzip.

poppler: 21.02.0 -> 21.05.0

Fix max llvm packages from string comparison to int comparison

This reverts commit f070de2.

It's not clear why this is required, but glib includes CoreServices headers and calls CoreServices functions, so it's reasonable to link against the framework explicitly.

Why does bash need binutils at all? What's wrong with stdenv? This avoids a broken ld wrapper, since binutils is binutils wrapped for linux, even though it's only required on darwin.

Helper scripts for code signing on darwin.

Co-authored-by: Moritz Angermann <moritz.angermann@gmail.com>

We could use our own libc++ here, but it is probably best to use the provided one to ensure consistency. This fixes some C++ programs when running aarch64-apple-ios-clang++.

File paths are copied from XCode 12.

…64-darwin The test fails due to dependency on W+X memory, which is forbidden as of 11.2.

libxml2 is used in bootstrapping, so the alternates solution of running libtoolize is tricky here.

Fixing: ``` /private/tmp/nix-build-file_cmds-264.1.1-osx-10.11.6.drv-0/file_cmds-264.1.1/ls/print.c:56:10: fatal error: 'membershipPriv.h' file not found ^~~~~~~~~~~~~~~~~~ 1 error generated. ```

``` /nix/store/5mgn511gbldf7xl5kjm27z9lj10xcycl-apple-framework-CoreData-11.0.0/Library/Frameworks/CoreData.framework/Headers/NSPersistentCloudKitContainerOptions.h:10:9: fatal error: 'CloudKit/CKDatabase.h' file not found ^~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. ``` ``` /nix/store/a7k7kqj08602785vsrss0xa85b08hik4-apple-framework-CloudKit-11.0.0/Library/Frameworks/CloudKit.framework/Headers/CKRecord.h:9:9: fatal error: 'CoreLocation/CLLocation.h' file not found ^~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. ```

It doesn't make sense to use llvm7, which doesn't work on arm64.

(cherry picked from commit 49d2ad0)

Fixes build on aarch64-darwin.

This package isn't expected to work outside of darwin, but must still evaluate cleanly.

Native support for Apple Silicon

libgcc requires the version scheme X.Y whilst our glibc version attribute usually is X.Y-Z where Z is our patchlevel.

Fix cargo-flash build

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

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

Conflicts: pkgs/tools/package-management/cargo-release/default.nix

Taken from PR #12355; other parts are still being discussed.

downstream packages use the major.minor version to determine ABI compatibility and paths which do not depend on patch version

…evel" The fix is no longer required with the restored passthru version. This reverts commit 6020fe2.

Conflicts: nixos/doc/manual/release-notes/rl-2105.xml pkgs/tools/security/sequoia/default.nix

…n darwin Fixing the following: ``` error: linking with `/nix/store/l3ca456ppdy8hi9hc0rvyr6mrm76si08-clang-wrapper-11.1.0/bin/cc` failed: exit code: 1 = note: ld: library not found for -liconv ```

The documentation requirements changed after the version upgrade in #123059.

Amendment to changes in 56fcbcd. Co-authored-by: John Ericson <John.Ericson@Obsidian.Systems>

Conflicts: pkgs/applications/terminal-emulators/alacritty/default.nix pkgs/servers/clickhouse/default.nix

Conflicts: pkgs/shells/ion/default.nix pkgs/tools/misc/cicero-tui/default.nix

Conflicts: pkgs/development/tools/kubie/default.nix

Since 37194a3 llvmPackages*.bintools is a bintools-wrapper. Thus it only contains a wrapper for `as` and `ld`. This change makes sense, but causes regressions like this one. Since the buildStdenv uses the llvm bintool set including lld as a linker we can use the cc.bintools.bintools derivation to get all the tools we need. Technically we wouldn't need to set absolute paths as all tools are also added to PATH, but it doesn't hurt either.

[staging-next] firefox: take LLVM tools from buildStdenv

Conflicts: pkgs/development/tools/rust/cargo-expand/default.nix pkgs/tools/misc/blflash/default.nix

Conflicts: pkgs/tools/networking/xh/default.nix

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Staging next #123279

Staging next #123279

Commits on May 11, 2021

Commits on May 12, 2021

Commits on May 13, 2021

Commits on May 14, 2021

Commits on May 15, 2021

Commits on May 16, 2021

Commits on May 17, 2021

Commits on May 18, 2021

Commits on May 19, 2021

Commits on May 20, 2021

Commits on May 21, 2021

Commits on May 22, 2021

Commits on May 23, 2021