chn/bscpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clang 2023.11 update

Browse Source 
Clang nos-v-merge branch has been merged into master.

Reviewed-By: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
This commit is contained in:
Aleix Roca Nonell 2023-11-24 15:22:50 +01:00 committed by Rodrigo Arias Mallo
parent 8a31895e48
commit af590d5ace
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
overlay.nix
View File

@ -16,7 +16,7 @@ let
clangOmpss2Nodes = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nodes; };
clangOmpss2OpenmpNodes = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nodes; clangOmpss2Unwrapped = final.clangOmpss2OpenmpUnwrapped; };
clangOmpss2Unwrapped = callPackage ./pkgs/llvm-ompss2/clang.nix { };
clangOmpss2OpenmpUnwrapped = import ./pkgs/llvm-ompss2/openmp.nix { clangOmpss2Unwrapped = final.clangOmpss2Unwrapped; };
clangOmpss2OpenmpUnwrapped = final.clangOmpss2Unwrapped.override { enableNosv = true; };
#extrae = callPackage ./pkgs/extrae/default.nix { }; # Broken and outdated
gpi-2 = callPackage ./pkgs/gpi-2/default.nix { };
intelPackages_2023 = callPackage ./pkgs/intel-oneapi/2023.nix { };

6
pkgs/llvm-ompss2/clang.nix
View File

@ -18,19 +18,19 @@
, useGit ? false
, gitUrl ? "ssh://git@bscpm03.bsc.es/llvm-ompss/llvm-mono.git"
, gitBranch ? "master"
, gitCommit ? "8d106db69c02fb6ec10baedc47b76f068b419d4a"
, gitCommit ? "0a6d6c64b04f9bbbe1399f18be426e191fb6b42c"
}:
let
stdenv = llvmPackages_latest.stdenv;
release = rec {
version = "2023.05.1";
version = "2023.11";
src = fetchFromGitHub {
owner = "bsc-pm";
repo = "llvm";
rev = "refs/tags/github-release-${version}";
sha256 = "sha256-NB/27F1ZRJf6MXFQjinT2gCsoPbEZYlBMhd3uKcK2GM=";
hash = "sha256-XLYS401BixGw3Ke/JKuikVKvbA92ENCdUvYLyZX9UtI=";
};
};

8
pkgs/llvm-ompss2/openmp.nix
View File

@ -1,8 +0,0 @@
{clangOmpss2Unwrapped}:
clangOmpss2Unwrapped.override {
useGit = true;
enableNosv = true;
gitBranch = "nos-v-v2.1";
gitCommit = "03bdfef9c264afdbee9f0a6cef32a66d976ef758";
}