From af590d5ace91bc6eca5ed87804c54235db3d22e8 Mon Sep 17 00:00:00 2001
From: Aleix Roca Nonell <aleix.rocanonell@bsc.es>
Date: Fri, 24 Nov 2023 15:22:50 +0100
Subject: [PATCH] Clang 2023.11 update

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

Reviewed-By: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
---
 overlay.nix                 | 2 +-
 pkgs/llvm-ompss2/clang.nix  | 6 +++---
 pkgs/llvm-ompss2/openmp.nix | 8 --------
 3 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 pkgs/llvm-ompss2/openmp.nix

diff --git a/overlay.nix b/overlay.nix
index c82c2ac..2963918 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -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 { };
diff --git a/pkgs/llvm-ompss2/clang.nix b/pkgs/llvm-ompss2/clang.nix
index 6a856af..1d936fe 100644
--- a/pkgs/llvm-ompss2/clang.nix
+++ b/pkgs/llvm-ompss2/clang.nix
@@ -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=";
     };
   };
 
diff --git a/pkgs/llvm-ompss2/openmp.nix b/pkgs/llvm-ompss2/openmp.nix
deleted file mode 100644
index 035d246..0000000
--- a/pkgs/llvm-ompss2/openmp.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{clangOmpss2Unwrapped}:
-
-clangOmpss2Unwrapped.override {
-      useGit = true;
-      enableNosv = true;
-      gitBranch = "nos-v-v2.1";
-      gitCommit = "03bdfef9c264afdbee9f0a6cef32a66d976ef758";
-}