dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #142593 from toonn/linux-llvm-bump

Browse Source
This commit is contained in:
Martin Weinelt 2022-02-01 22:56:55 +01:00 committed by GitHub
commit 184d6ba76b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
View File

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

35
pkgs/top-level/all-packages.nix
View File

@ -3921,14 +3921,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 { };
@ -12804,10 +12797,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
@ -14399,13 +14389,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 { };
@ -15712,9 +15696,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 { };
@ -17495,8 +17477,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 {
@ -23014,9 +22995,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 { };
@ -30578,7 +30557,7 @@ with pkgs;
boost = boost175;
};
zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; };
zcash = callPackage ../applications/blockchains/zcash { };
lightwalletd = callPackage ../applications/blockchains/lightwalletd { };