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

Linux bump default LLVM to 11 #142593

Merged
merged 8 commits into from
Feb 1, 2022
Merged

Linux bump default LLVM to 11 #142593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4f1480e
Qt5: WebEngine turn off warning causing errors
toonn Jul 12, 2021
bf09623
llvmPackages: Update Linux default to 11
toonn Dec 21, 2021
a0283ba
bear: Darwin stdenv is now LLVM 11 by default
toonn Dec 27, 2021
54ac4a7
c3c: llvmPackages defaults to LLVM 11 on the main platforms
toonn Dec 27, 2021
377515c
ispc: LLVM defaults to 11 on the main platforms
toonn Dec 27, 2021
b5d1453
odin: LLVM defaults to 11 on the main platforms
toonn Dec 27, 2021
cba9e99
zcash: LLVM defaults to 11 on the main platforms
toonn Dec 27, 2021
dc56a79
beamerpresenter: Darwin's clang is now 11 by default
toonn Dec 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkgs/development/libraries/qt-5/modules/qtwebengine.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ qtModule {
] ++ lib.optionals stdenv.isDarwin [
"-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_12"
"-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_12"
"-Wno-elaborated-enum-base"

#
# Prevent errors like
Expand Down
35 changes: 7 additions & 28 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3847,14 +3847,7 @@ with pkgs;

bdsync = callPackage ../tools/backup/bdsync { };

beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter {
# developed for a compiler with C++20 support
stdenv =
if stdenv.isDarwin then
overrideCC stdenv clang_10
else
stdenv;
};
beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter { };

beanstalkd = callPackage ../servers/beanstalkd { };

Expand Down Expand Up @@ -12607,10 +12600,7 @@ with pkgs;
/**/ if platform.isDarwin then 11
else if platform.isFreeBSD then 7
else if platform.isAndroid then 12
else if platform.isLinux then
/**/ if platform.isRiscV then 11
else if platform.isMusl then 11
else 7
else if platform.isLinux then 11
else if platform.isWasm then 8
else latest_version;
# We take the "max of the mins". Why? Since those are lower bounds of the
Expand Down Expand Up @@ -14201,13 +14191,7 @@ with pkgs;

buildBazelPackage = callPackage ../build-support/build-bazel-package { };

bear = callPackage ../development/tools/build-managers/bear {
# error: no viable constructor or deduction guide for deduction of template arguments of 'map'
stdenv = if stdenv.hostPlatform.system == "x86_64-darwin" then
llvmPackages_11.stdenv
else
stdenv;
};
bear = callPackage ../development/tools/build-managers/bear { };

bingrep = callPackage ../development/tools/analysis/bingrep { };

Expand Down Expand Up @@ -15486,9 +15470,7 @@ with pkgs;

c2ffi = callPackage ../development/tools/misc/c2ffi { };

c3c = callPackage ../development/compilers/c3c {
llvmPackages = llvmPackages_11;
};
c3c = callPackage ../development/compilers/c3c { };

swfmill = callPackage ../tools/video/swfmill { };

Expand Down Expand Up @@ -17250,8 +17232,7 @@ with pkgs;
iso-flags = callPackage ../data/icons/iso-flags { };

ispc = callPackage ../development/compilers/ispc {
stdenv = llvmPackages_11.stdenv;
llvmPackages = llvmPackages_11;
inherit (llvmPackages) stdenv;
};

isso = callPackage ../servers/isso { };
Expand Down Expand Up @@ -22703,9 +22684,7 @@ with pkgs;

octomap = callPackage ../development/libraries/octomap { };

odin = callPackage ../development/compilers/odin {
llvmPackages = llvmPackages_11;
};
odin = callPackage ../development/compilers/odin { };

odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };

Expand Down Expand Up @@ -30166,7 +30145,7 @@ with pkgs;
boost = boost175;
};

zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; };
zcash = callPackage ../applications/blockchains/zcash { };

lightwalletd = callPackage ../applications/blockchains/lightwalletd { };

Expand Down