From 7c1b6a3abce38e51958eef6242ef949e255a98e8 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 25 Nov 2024 01:50:17 +0000 Subject: [PATCH 1/6] codon: LLVM-14 unpin package marked as broken -- no need to pin --- 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 5fc418283c33..c124a33f85a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5959,7 +5959,7 @@ with pkgs; }; codon = callPackage ../development/compilers/codon { - inherit (llvmPackages_14) lld stdenv; + inherit (llvmPackages) lld stdenv; }; colmap = libsForQt5.callPackage ../applications/science/misc/colmap { inherit (config) cudaSupport; }; From c90e5ad038b43e7b6c09876a67d6e65ffc70bec4 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 25 Nov 2024 01:54:44 +0000 Subject: [PATCH 2/6] clazy: unpin LLVM-14 --- 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 c124a33f85a1..e77ba123c6bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6000,8 +6000,7 @@ with pkgs; }; clazy = callPackage ../development/tools/analysis/clazy { - llvmPackages = llvmPackages_14; - stdenv = llvmPackages_14.stdenv; + stdenv = llvmPackages.stdenv; }; #Use this instead of stdenv to build with clang From ec11f1cc9705de9db8bb07b0a877bdc61ab950ef Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 25 Nov 2024 01:56:13 +0000 Subject: [PATCH 3/6] ccls: unpin LLVM-14 --- 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 e77ba123c6bc..07d80d9eb591 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7792,9 +7792,7 @@ with pkgs; ### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS - ccls = callPackage ../development/tools/language-servers/ccls { - llvmPackages = llvmPackages_14; - }; + ccls = callPackage ../development/tools/language-servers/ccls { }; fortls = python3.pkgs.callPackage ../development/tools/language-servers/fortls { }; From f02f51572567cbc6dbaa14b169433941375059a6 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 25 Nov 2024 01:59:53 +0000 Subject: [PATCH 4/6] cvise: unpin LLVM-14 --- 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 07d80d9eb591..4229a1dab3a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8158,7 +8158,7 @@ with pkgs; cvise = python3Packages.callPackage ../development/tools/misc/cvise { # cvise keeps up with fresh llvm releases and supports wide version range - inherit (llvmPackages_14) llvm libclang; + inherit (llvmPackages) llvm libclang; }; dbt = with python3Packages; toPythonApplication dbt-core; From c5a0fff8793b750e48da11f14ae9c085c3edc6e9 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 25 Nov 2024 02:08:16 +0000 Subject: [PATCH 5/6] zcash: unpin LLVM-14 --- 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 4229a1dab3a5..096761ac7410 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16664,7 +16664,7 @@ with pkgs; zcash = callPackage ../applications/blockchains/zcash { inherit (darwin.apple_sdk.frameworks) Security; - stdenv = llvmPackages_14.stdenv; + stdenv = llvmPackages.stdenv; }; polkadot = callPackage ../applications/blockchains/polkadot { From d649398796126aa444e008ea7d07a21d2bcc605e Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 25 Nov 2024 02:14:37 +0000 Subject: [PATCH 6/6] xdp-tools: unpin LLVM-14 > clang: error: unsupported option '-fzero-call-used-regs=used-gpr' for target 'bpf' required hardeningDisable zerocallusedregs --- pkgs/tools/networking/xdp-tools/default.nix | 1 + pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/xdp-tools/default.nix b/pkgs/tools/networking/xdp-tools/default.nix index 8cf07fc72385..d1a286117224 100644 --- a/pkgs/tools/networking/xdp-tools/default.nix +++ b/pkgs/tools/networking/xdp-tools/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { wireshark-cli # for tshark ]; + hardeningDisable = [ "zerocallusedregs" ]; # When building BPF, the default CC wrapper is interfering a bit too much. BPF_CFLAGS = "-fno-stack-protector -Wno-error=unused-command-line-argument"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 096761ac7410..5149713be458 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5703,9 +5703,7 @@ with pkgs; buildGoModule = buildGo123Module; }; - xdp-tools = callPackage ../tools/networking/xdp-tools { - llvmPackages = llvmPackages_14; - }; + xdp-tools = callPackage ../tools/networking/xdp-tools { }; ugarit = callPackage ../tools/backup/ugarit { inherit (chickenPackages_4) eggDerivation fetchegg;