From 4f1480eb2967f2e0f3929ad85bd162765edfda88 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 12 Jul 2021 17:38:08 +0200 Subject: [PATCH 1/8] Qt5: WebEngine turn off warning causing errors --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 68945625f5b4..65b740573fcb 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -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 From bf0962385217abd159088b7eb9ce982a02379a02 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 21 Dec 2021 21:48:18 +0100 Subject: [PATCH 2/8] llvmPackages: Update Linux default to 11 Update the default LLVM version on Linux to stay synchronized with Darwin, where LLVM is tied to the stdenv. --- pkgs/top-level/all-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe1c97840eb7..037140ac51c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12607,10 +12607,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 From a0283ba0cbe8cc411bdaa130e8d9f9af122ac207 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 27 Dec 2021 15:05:52 +0100 Subject: [PATCH 3/8] bear: Darwin stdenv is now LLVM 11 by default --- pkgs/top-level/all-packages.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 037140ac51c3..b1b7ba4059e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14198,13 +14198,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 { }; From 54ac4a7ff2b997fe96e61279857f51e08523bc39 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 27 Dec 2021 15:09:36 +0100 Subject: [PATCH 4/8] c3c: llvmPackages defaults to LLVM 11 on the main platforms --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1b7ba4059e7..795cac11b7d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15477,9 +15477,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 { }; From 377515c87709d35d5de390970d9f0e4b78be965f Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 27 Dec 2021 15:17:00 +0100 Subject: [PATCH 5/8] ispc: LLVM defaults to 11 on the main platforms --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 795cac11b7d2..fedeac9995a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17239,8 +17239,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 { }; From b5d14534cc4c397fda362e179c211482fb40567c Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 27 Dec 2021 15:17:59 +0100 Subject: [PATCH 6/8] odin: LLVM defaults to 11 on the main platforms --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fedeac9995a3..0a5a4dad1cf0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22691,9 +22691,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 { }; From cba9e999dd76eb5ece67041c3cedb8e92cc8dd39 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 27 Dec 2021 15:21:35 +0100 Subject: [PATCH 7/8] zcash: LLVM defaults to 11 on the main platforms --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a5a4dad1cf0..d33a05f7c86d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30152,7 +30152,7 @@ with pkgs; boost = boost175; }; - zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; }; + zcash = callPackage ../applications/blockchains/zcash { }; lightwalletd = callPackage ../applications/blockchains/lightwalletd { }; From dc56a79224bdae4ad59a7d8a7c68747155ad1b8e Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 27 Dec 2021 15:25:42 +0100 Subject: [PATCH 8/8] beamerpresenter: Darwin's clang is now 11 by default --- pkgs/top-level/all-packages.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d33a05f7c86d..eed90f06aeb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };