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

treewide: unpin most LLVM-14s in all-packages.nix (#358871)

Browse Source
This commit is contained in:
Emily 2024-11-28 10:17:15 +00:00 committed by GitHub
commit ea60c79b79
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/tools/networking/xdp-tools/default.nix
View File

@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
wireshark-cli # for tshark wireshark-cli # for tshark
]; ];
hardeningDisable = [ "zerocallusedregs" ];
# When building BPF, the default CC wrapper is interfering a bit too much. # When building BPF, the default CC wrapper is interfering a bit too much.
BPF_CFLAGS = "-fno-stack-protector -Wno-error=unused-command-line-argument"; BPF_CFLAGS = "-fno-stack-protector -Wno-error=unused-command-line-argument";

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

@ -5683,9 +5683,7 @@ with pkgs;
buildGoModule = buildGo123Module; buildGoModule = buildGo123Module;
}; };
xdp-tools = callPackage ../tools/networking/xdp-tools { xdp-tools = callPackage ../tools/networking/xdp-tools { };
llvmPackages = llvmPackages_14;
};
ugarit = callPackage ../tools/backup/ugarit { ugarit = callPackage ../tools/backup/ugarit {
inherit (chickenPackages_4) eggDerivation fetchegg; inherit (chickenPackages_4) eggDerivation fetchegg;
@ -5939,7 +5937,7 @@ with pkgs;
}; };
codon = callPackage ../development/compilers/codon { codon = callPackage ../development/compilers/codon {
inherit (llvmPackages_14) lld stdenv; inherit (llvmPackages) lld stdenv;
}; };
colmap = libsForQt5.callPackage ../applications/science/misc/colmap { inherit (config) cudaSupport; }; colmap = libsForQt5.callPackage ../applications/science/misc/colmap { inherit (config) cudaSupport; };
@ -5980,8 +5978,7 @@ with pkgs;
}; };
clazy = callPackage ../development/tools/analysis/clazy { clazy = callPackage ../development/tools/analysis/clazy {
llvmPackages = llvmPackages_14; stdenv = llvmPackages.stdenv;
stdenv = llvmPackages_14.stdenv;
}; };
#Use this instead of stdenv to build with clang #Use this instead of stdenv to build with clang
@ -7776,9 +7773,7 @@ with pkgs;
### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS ### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS
ccls = callPackage ../development/tools/language-servers/ccls { ccls = callPackage ../development/tools/language-servers/ccls { };
llvmPackages = llvmPackages_14;
};
fortls = python3.pkgs.callPackage ../development/tools/language-servers/fortls { }; fortls = python3.pkgs.callPackage ../development/tools/language-servers/fortls { };
@ -8144,7 +8139,7 @@ with pkgs;
cvise = python3Packages.callPackage ../development/tools/misc/cvise { cvise = python3Packages.callPackage ../development/tools/misc/cvise {
# cvise keeps up with fresh llvm releases and supports wide version range # 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; dbt = with python3Packages; toPythonApplication dbt-core;
@ -16598,7 +16593,7 @@ with pkgs;
zcash = callPackage ../applications/blockchains/zcash { zcash = callPackage ../applications/blockchains/zcash {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
stdenv = llvmPackages_14.stdenv; stdenv = llvmPackages.stdenv;
}; };
polkadot = callPackage ../applications/blockchains/polkadot { polkadot = callPackage ../applications/blockchains/polkadot {