Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[22.11] Backport llvmPackages_16 #230327

Merged
merged 9 commits into from
May 6, 2023
Merged

[22.11] Backport llvmPackages_16 #230327

merged 9 commits into from
May 6, 2023

Commits on May 6, 2023

  1. llvmPackages_16: init 

    (cherry picked from commit 2c627d9)
Reason: This backport is required for building Chromium on NixOS 22.11
(we need the most recent versions for important security fixes).
    @RaitoBezarius @primeos
    RaitoBezarius authored and primeos committed May 6, 2023
    Configuration menu
    Copy the full SHA
    48ee6cd View commit details
    Browse the repository at this point in the history

  2. clang_16: Reference the correct LLVM packages version (16 vs. 15) 

    Kept separate from 2c627d9 to skip CI for this trivial change.

(cherry picked from commit 46d395e)
    @primeos
    primeos committed May 6, 2023
    Configuration menu
    Copy the full SHA
    347836e View commit details
    Browse the repository at this point in the history

  3. llvmPackages_16.llvm: fix build on armv7l-linux 

    (cherry picked from commit d4c2564)
    @misuzu @primeos
    misuzu authored and primeos committed May 6, 2023
    Configuration menu
    Copy the full SHA
    f16034c View commit details
    Browse the repository at this point in the history

  4. llvmPackages_16.llvm: fix postPatch on darwin 

    (cherry picked from commit 3c7fba2)
    @wegank @primeos
    wegank authored and primeos committed May 6, 2023
    Configuration menu
    Copy the full SHA
    b9e782d View commit details
    Browse the repository at this point in the history

  5. llvmPackages_16.llvm: avoid calling roundevenf on darwin 

    (cherry picked from commit fd155c2)
    @wegank @primeos
    wegank authored and primeos committed May 6, 2023
    Configuration menu
    Copy the full SHA
    310db76 View commit details
    Browse the repository at this point in the history

  6. libcxxrt: init at unstable-2022-08-08 

    (cherry picked from commit c672de3)
Reason: This is required for llvmPackages_16 (and llvmPackages_15). Only
if stdenv.hostPlatform.isFreeBSD but backporting new packages is fine
and so that everything evaluates without errors.
    @alyssais @primeos
    alyssais authored and primeos committed May 6, 2023
    Configuration menu
    Copy the full SHA
    e9d8836 View commit details
    Browse the repository at this point in the history

  7. llvmPackages_16: Drop platforms.{power,s390x} from meta.platforms 

    This code is backported from nixos-unstable (2c627d9) and the power
platform isn't defined/supported on NixOS 22.11 yet, e.g.:
```
$ nix-instantiate -A llvmPackages_16
error: attribute 'power' missing

       at /home/michael/nixpkgs/worktrees/22.11/pkgs/development/compilers/llvm/16/default.nix:96:7:

           95|       lib.platforms.mips ++
           96|       lib.platforms.power ++
             |       ^
           97|       lib.platforms.riscv ++
(use '--show-trace' to show detailed location information)
```
    @primeos
    primeos committed May 6, 2023
    Configuration menu
    Copy the full SHA
    cf48cb9 View commit details
    Browse the repository at this point in the history

  8. llvm: Backport a patch that is required for llvmPackages_16 

    This comes from eb2eafd (or rather [0]). I only backported the
patch instead of the whole commit to avoid mass rebuilds for
llvmPackages 13 and 14 (there is a small diff in the patches due to the
headers ("index" and the line numbers)).

This fixes:
```
error (ignored): error: end of string reached
error: getting status of 'pkgs/development/compilers/llvm/common/clang/add-nostdlibinc-flag.patch': No such file or directory
```

[0]: pkgs/development/compilers/llvm/git/clang/add-nostdlibinc-flag.patch
    @primeos
    primeos committed May 6, 2023
    Configuration menu
    Copy the full SHA
    168ba05 View commit details
    Browse the repository at this point in the history

  9. llvmPackages_16: Fix an evaluation error from setting NIX_CFLAGS_COMPILE 

    This code is backported from nixos-unstable (2c627d9) and isn't
fully compatible with NixOS 22.11 due to other missing
abstractions/changes. I simply went with the exact same code as the
other llvmPackages already use here. This fixes the following error:
```
error: cannot coerce a set to a string

        at pkgs/development/compilers/llvm/16/compiler-rt/default.nix:34:3:

            33|
            34|   env.NIX_CFLAGS_COMPILE = toString [
              |   ^
            35|     "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
```
    @primeos
    primeos committed May 6, 2023
    Configuration menu
    Copy the full SHA
    2cdddaa View commit details
    Browse the repository at this point in the history