From f32a72fbfa0d98dc1f41734db29c2a983f57957a Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Sun, 12 Jan 2025 17:19:32 +0100
Subject: [PATCH] adaptivecpp: update to LLVM 18

---
 pkgs/by-name/ad/adaptivecpp/package.nix |  8 +++----
 pkgs/by-name/ad/adaptivecpp/tests.nix   | 29 +++++++++++++++----------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ad/adaptivecpp/package.nix b/pkgs/by-name/ad/adaptivecpp/package.nix
index 4b8c29105013..cda766788f25 100644
--- a/pkgs/by-name/ad/adaptivecpp/package.nix
+++ b/pkgs/by-name/ad/adaptivecpp/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   fetchFromGitHub,
-  llvmPackages_17,
+  llvmPackages_18,
   python3,
   cmake,
   boost,
@@ -24,7 +24,7 @@
 let
   inherit (llvmPackages) stdenv;
   rocmPackages = rocmPackages_6;
-  llvmPackages = llvmPackages_17;
+  llvmPackages = llvmPackages_18;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "adaptivecpp";
@@ -98,8 +98,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     tests =
-        # Loosely based on the AdaptiveCpp GitHub CI: https://github.com/AdaptiveCpp/AdaptiveCpp/blob/develop/.github/workflows/linux.yml
-        # This may be overkill, especially as this won't be run on GPU on the CI
+      # Loosely based on the AdaptiveCpp GitHub CI: https://github.com/AdaptiveCpp/AdaptiveCpp/blob/develop/.github/workflows/linux.yml
+      # This may be overkill, especially as this won't be run on GPU on the CI
       let
         runner = targets: enablePstlTests: callPackage ./tests.nix { inherit enablePstlTests; };
         run =
diff --git a/pkgs/by-name/ad/adaptivecpp/tests.nix b/pkgs/by-name/ad/adaptivecpp/tests.nix
index 409caeabce94..cf8e1d9516f7 100644
--- a/pkgs/by-name/ad/adaptivecpp/tests.nix
+++ b/pkgs/by-name/ad/adaptivecpp/tests.nix
@@ -20,8 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
     src
     ;
 
-    nativeBuildInputs = [ cmake tbb ];
-    buildInputs = [ boost ];
+  nativeBuildInputs = [
+    cmake
+    tbb
+  ];
+  buildInputs = [ boost ];
 
   sourceRoot = "${adaptivecpp.src.name}/tests";
 
@@ -34,14 +37,16 @@ stdenv.mkDerivation (finalAttrs: {
       (lib.cmakeFeature "DACCP_TARGETS" "${targets}")
     ];
 
-  installPhase = ''
-    mkdir $out
-    install -Dm755 sycl_tests -t $out/bin/
-    install -Dm755 rt_tests -t $out/bin/
-    install -Dm755 device_compilation_tests -t $out/bin/
-    install -Dm755 dump_test/dump_test -t $out/bin/
-    install -Dm755 platform_api/platform_api -t $out/bin/
-  '' + lib.optionalString enablePstlTests ''
-    install -Dm755 pstl_tests -t $out/bin/
-  '';
+  installPhase =
+    ''
+      mkdir $out
+      install -Dm755 sycl_tests -t $out/bin/
+      install -Dm755 rt_tests -t $out/bin/
+      install -Dm755 device_compilation_tests -t $out/bin/
+      install -Dm755 dump_test/dump_test -t $out/bin/
+      install -Dm755 platform_api/platform_api -t $out/bin/
+    ''
+    + lib.optionalString enablePstlTests ''
+      install -Dm755 pstl_tests -t $out/bin/
+    '';
 })