about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2024-06-08 19:49:54 -0400
committerGitHub <noreply@github.com>2024-06-08 19:49:54 -0400
commit2a823de13340bc1b981e98ff9b15a5b42eee3263 (patch)
tree310284d8723ebc422fcc0bba5b9949c03b533ba9
parenta24f97bf27cb69a3a696b211a1cf17a275026c6a (diff)
parent5d99a8dc803c7f5961dfcc72f80c5e08c326de1d (diff)
Merge pull request #318350 from MilesCranmer/julia-target-settings
julia: update JULIA_CPU_TARGET from latest upstream settings
-rw-r--r--pkgs/development/compilers/julia/generic.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/julia/generic.nix b/pkgs/development/compilers/julia/generic.nix
index 7f690d44e1634..209e97edcce70 100644
--- a/pkgs/development/compilers/julia/generic.nix
+++ b/pkgs/development/compilers/julia/generic.nix
@@ -52,10 +52,10 @@ stdenv.mkDerivation rec {
     "prefix=$(out)"
     "USE_BINARYBUILDER=0"
   ] ++ lib.optionals stdenv.isx86_64 [
-    # https://github.com/JuliaCI/julia-buildbot/blob/master/master/inventory.py
-    "JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)"
+    # https://github.com/JuliaCI/julia-buildkite/blob/main/utilities/build_envs.sh
+    "JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1);x86-64-v4,-rdrnd,base(1)"
   ] ++ lib.optionals stdenv.isAarch64 [
-    "JULIA_CPU_TARGET=generic;cortex-a57;thunderx2t99;armv8.2-a,crypto,fullfp16,lse,rdm"
+    "JULIA_CPU_TARGET=generic;cortex-a57;thunderx2t99;carmel,clone_all;apple-m1,base(3);neoverse-512tvb,base(3)"
   ];
 
   # remove forbidden reference to $TMPDIR