abonerib/jungle
1
0
Fork 0
forked from rarias/jungle
Code Pull Requests 2 Actions Activity

Use explicit version instead of wildcard in intel

Browse Source 
Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
This commit is contained in:
Aleix Boné
2026-03-16 16:28:31 +01:00
parent 95b412ddc1
commit f41bdf88bd
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/intel-oneapi/packages.nix
View File

@@ -233,6 +233,8 @@ let
mkl = "2025.2"; mkl = "2025.2";
mpi = "2021.16"; mpi = "2021.16";
tbb = "2022.2"; tbb = "2022.2";
llvmMajorVersion = 21;
}; };
"2024" = { "2024" = {
tcm = "1.1"; tcm = "1.1";
@@ -252,6 +254,8 @@ let
mpi = "2021.13"; mpi = "2021.13";
tbb = "2021.13"; tbb = "2021.13";
llvmMajorVersion = 19;
extraPackages = [ extraPackages = [
sqlite sqlite
elfutils elfutils

8
pkgs/intel-oneapi/patch_intel.nix
View File

@@ -39,7 +39,9 @@ lib.makeOverridable (
removeAttrs removeAttrs
; ;
__components = removeAttrs components [ "extraPackages" ]; inherit (components) llvmMajorVersion;
__components = removeAttrs components [ "extraPackages" "llvmMajorVersion" ];
_components = __components; _components = __components;
# _components = lib.traceSeqN 2 { # _components = lib.traceSeqN 2 {
# inherit unpatched __components; # inherit unpatched __components;
@@ -63,7 +65,7 @@ lib.makeOverridable (
]; ];
cc-cflags = [ cc-cflags = [
"--gcc-toolchain=${gcc.cc}" "--gcc-toolchain=${gcc.cc}"
"-isystem \"${cc.original}/lib/clang/*/include\"" "-isystem ${cc.original or cc}/lib/clang/${toString cc.llvmMajorVersion}/include"
"-isystem ${cc}/include" "-isystem ${cc}/include"
"-isystem ${cc}/include/intel64" "-isystem ${cc}/include/intel64"
"-isystem ${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}/include" "-isystem ${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}/include"
@@ -171,7 +173,7 @@ lib.makeOverridable (
pname = "intel-${folder}"; pname = "intel-${folder}";
inherit version; inherit version;
paths = [ original ] ++ lib.optionals (folder == "compiler") [ etc-vendors ]; paths = [ original ] ++ lib.optionals (folder == "compiler") [ etc-vendors ];
passthru = { inherit original; }; passthru = { inherit original llvmMajorVersion; };
} }
) _components; ) _components;
in in